diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B')
13 files changed, 1463 insertions, 1463 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1481bf653e..e776376302 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_4: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_01_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_01_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_01_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,57 +48,37 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_01_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_01_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role: + port_pd01_port_01_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_01_vlan_requirements: type: list required: true status: SUPPORTED @@ -105,20 +105,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_01: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.outgoing.bytes_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -148,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd01_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: @@ -165,12 +171,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,12 +201,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -225,12 +219,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -254,8 +242,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd01_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -277,6 +265,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd01_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_pd_server_pd01_port_01: + 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_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -288,6 +290,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,13 +307,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 + attachment_pd_server_pd01_port_01: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED disk.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -313,13 +318,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_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.incoming.packets_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd01_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: @@ -368,24 +373,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_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 - forwarder_pd_server_pd01_port: + forwarder_pd_server_pd01_port_01: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.size_pd_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.ephemeral.size_pd_server: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -397,11 +402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,13 +420,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_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.iops_pd_server: + network.incoming.packets_pd_server_pd01_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: @@ -435,6 +435,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_5: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_ps02_port_01_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -443,12 +449,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps02_port_ip_requirements: + port_ps02_port_01_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_ps02_port_01_order: + type: integer + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -461,90 +471,80 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps02_port_01_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_ps02_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_ps02_port_network_role: + port_ps02_port_01_network_role: type: string required: true status: SUPPORTED - port_ps02_port_vlan_requirements: - type: list + port_ps02_port_01_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps02_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: - type: string + port_ps02_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps02_port_related_networks: + port_ps02_port_01_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_ps02_port_order: - type: integer - required: true - status: SUPPORTED + type: string compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps02_port_network: - type: list + port_ps02_port_01_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string requirements: - - dependency_pd_server: + - dependency_pd_server_ps02_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pd_server_ps02_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_ps02_port: + - 1 + - 1 + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_ps02_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: scalable_pd_server: type: tosca.capabilities.Scalable @@ -557,14 +557,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_ps02_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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -583,7 +575,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_ps02_port: + network.outgoing.packets.rate_pd_server_ps02_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: @@ -630,13 +622,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.incoming.packets.rate_pd_server_ps02_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_pd_server_ps02_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.incoming.packets.rate_pd_server_ps02_port: + disk.iops_pd_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: @@ -648,6 +646,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_ps02_port_01: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -672,6 +675,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_ps02_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 endpoint_pd_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -683,21 +692,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_ps02_port: + disk.device.allocation_pd_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.allocation_pd_server: + disk.allocation_pd_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.allocation_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_ps02_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -712,11 +720,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_ps02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -734,17 +737,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_ps02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_ps02_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.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -769,12 +761,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_ps02_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.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -794,60 +780,74 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_ps02_port: + network.incoming.bytes.rate_pd_server_ps02_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.requests.rate_pd_server: + network.outgoing.bytes_pd_server_ps02_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.ephemeral.size_pd_server: + forwarder_pd_server_ps02_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pd_server_ps02_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.outgoing.bytes_pd_server_ps02_port: + disk.write.requests.rate_pd_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.write.requests_pd_server: + disk.ephemeral.size_pd_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.latency_pd_server: + disk.write.requests_pd_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 - forwarder_pd_server_ps02_port: - type: org.openecomp.capabilities.Forwarder + disk.device.latency_pd_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.latency_pd_server: + network.incoming.packets_pd_server_ps02_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.capacity_pd_server: + binding_pd_server_ps02_port_01: + 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.latency_pd_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.incoming.packets_pd_server_ps02_port: + disk.device.capacity_pd_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: @@ -862,6 +862,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_6: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -882,68 +888,62 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -959,20 +959,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1013,6 +1021,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd02_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1043,15 +1057,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + network.outpoing.packets_pd_server_pd02_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: @@ -1075,29 +1081,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_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 - feature_pd_server_pd02_port: + feature_pd_server_pd02_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_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 - network.outgoing.bytes.rate_pd_server_pd02_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1121,11 +1109,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1144,12 +1127,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_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 binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -1172,7 +1149,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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: @@ -1184,6 +1161,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd02_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_pd_server_pd02_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.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1208,6 +1197,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1227,36 +1222,42 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_pd02_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.rate_pd_server: + network.incoming.bytes.rate_pd_server_pd02_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.ephemeral.size_pd_server: + disk.write.requests.rate_pd_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.write.requests_pd_server: + disk.ephemeral.size_pd_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.latency_pd_server: + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_pd_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.incoming.packets.rate_pd_server_pd02_port: + disk.device.latency_pd_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: @@ -1280,15 +1281,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_03_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1309,11 +1321,13 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_03_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_03_related_networks: type: list required: true status: SUPPORTED @@ -1323,48 +1337,34 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: + port_pd01_port_03_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_03_order: + type: integer required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_03_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd01_port_03_network_role_tag: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -1372,6 +1372,19 @@ node_types: entry_schema: type: string requirements: + - dependency_pd_server_pd01_port_03: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pd01_port_03: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1386,20 +1399,13 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pd01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + capabilities: + network.outgoing.bytes_pd_server_pd01_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - 1 - capabilities: + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1429,7 +1435,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd01_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1446,12 +1452,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1482,9 +1482,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd01_port_03: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1506,12 +1505,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1535,8 +1528,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + network.incoming.bytes_pd_server_pd01_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1563,12 +1557,31 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_03: + 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.read.requests_pd_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.incoming.bytes.rate_pd_server_pd01_port_03: + type: org.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_pd_server_pd01_port_03: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -1580,27 +1593,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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.write.bytes_pd_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.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd01_port_03: type: org.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_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1649,17 +1654,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd01_port_03: type: org.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_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1672,14 +1672,20 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd01_port_03: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests_pd_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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd01_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1701,12 +1707,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1716,82 +1716,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_7: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_0_order: + type: integer + required: true + status: SUPPORTED + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -1813,20 +1813,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1856,12 +1864,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1873,12 +1875,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1909,7 +1905,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_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: @@ -1933,7 +1929,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_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_pd_server_pd01_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_pd_server_pd01_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: @@ -1951,6 +1959,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1962,17 +1975,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_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 + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1996,6 +2009,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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_pd_server: type: tosca.capabilities.Node occurrences: @@ -2007,27 +2026,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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.write.bytes_pd_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.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_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: @@ -2057,6 +2068,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2076,14 +2093,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2105,11 +2116,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2128,12 +2134,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2143,6 +2143,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_03_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd02_port_03_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2163,68 +2173,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd02_port_order: + port_pd02_port_03_order: type: integer required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_03_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_03_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_03_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: string + port_pd02_port_03_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: + port_pd02_port_03_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2240,20 +2240,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_03: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_03: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_03: + type: org.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_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -2265,6 +2271,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd02_port_03: + type: org.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_pd_server_pd02_port_03: + 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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2294,104 +2314,90 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_pd_server: + network.incoming.packets.rate_pd_server_pd02_port_03: type: org.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_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd02_port_03: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + cpu_pd_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_pd_server: + cpu_util_pd_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.read.bytes.rate_pd_server: + disk.device.write.requests.rate_pd_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 - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + disk.read.bytes_pd_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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd02_port_03: type: org.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_pd_server: + disk.device.read.bytes.rate_pd_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 - cpu.delta_pd_server: + disk.iops_pd_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_pd_server_pd02_port: + memory.resident_pd_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + cpu.delta_pd_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.rate_pd_server_pd02_port: + vcpus_pd_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 - vcpus_pd_server: + disk.device.write.bytes.rate_pd_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.write.bytes.rate_pd_server: + disk.device.write.requests_pd_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.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_pd02_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2402,11 +2408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2425,12 +2426,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: + network.outgoing.bytes_pd_server_pd02_port_03: type: org.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_pd_server_pd02_port_03: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -2442,18 +2448,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd02_port_03: + type: org.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_pd_server: + network.outpoing.packets_pd_server_pd02_port_03: type: org.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_pd_server_pd02_port: + feature_pd_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.usage_pd_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: @@ -2508,8 +2520,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd02_port_03: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2537,12 +2549,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_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.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2561,15 +2567,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_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 org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_02_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2578,6 +2582,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd02_port_02_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -2590,51 +2600,47 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_02_network_role: + type: string required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_02_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd02_port_02_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_02_related_networks: + type: list required: true status: SUPPORTED - port_pd02_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_02_network_role_tag: + type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: - type: list + port_pd02_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + port_pd02_port_02_network: type: list required: true status: SUPPORTED @@ -2646,12 +2652,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2667,20 +2667,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_02: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_02: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -2692,12 +2698,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd02_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory.usage_pd_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 + binding_pd_server_pd02_port_02: + 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 memory_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2721,104 +2741,90 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_pd_server: + network.incoming.packets.rate_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + cpu_pd_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.write.requests.rate_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd02_port_02: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes_pd_server: + cpu_util_pd_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.read.bytes.rate_pd_server: + disk.device.write.requests.rate_pd_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 - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + disk.read.bytes_pd_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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_pd_server: + disk.device.read.bytes.rate_pd_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 - cpu.delta_pd_server: + disk.iops_pd_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_pd_server_pd02_port: + memory.resident_pd_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + cpu.delta_pd_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.rate_pd_server_pd02_port: + vcpus_pd_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 - vcpus_pd_server: + disk.device.write.bytes.rate_pd_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.write.bytes.rate_pd_server: + disk.device.write.requests_pd_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.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2829,17 +2835,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_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 + forwarder_pd_server_pd02_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2852,7 +2858,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: + network.outgoing.bytes_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2869,18 +2875,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd02_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_pd_server: + network.outpoing.packets_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + feature_pd_server: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.usage_pd_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: @@ -2935,8 +2947,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd02_port_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2964,12 +2976,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_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.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2988,15 +2994,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_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 org.openecomp.resource.abstract.nodes.pd_server_3: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_02_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3017,62 +3027,52 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_02_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd01_port_02_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_02_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_02_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + port_pd01_port_02_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_02_ip_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_02_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pd_server_user_data_format: type: list required: true @@ -3094,20 +3094,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_02: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_02: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.outgoing.bytes_pd_server_pd01_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -3137,24 +3143,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_pd_server: + network.outpoing.packets_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + disk.write.bytes.rate_pd_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: @@ -3190,15 +3190,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_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.iops_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd01_port_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3214,12 +3213,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3243,11 +3236,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3266,17 +3254,37 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd01_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_02: + 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.read.requests_pd_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.incoming.bytes.rate_pd_server_pd01_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -3288,13 +3296,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 + attachment_pd_server_pd01_port_02: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED disk.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -3302,13 +3307,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3357,24 +3362,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.size_pd_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.ephemeral.size_pd_server: + network.outgoing.packets.rate_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3386,8 +3386,8 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_02: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3409,13 +3409,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + disk.device.iops_pd_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.iops_pd_server: + network.incoming.packets_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7692,4 +7692,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml index 9914f9b938..22342cabed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml @@ -133,28 +133,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_0_network: + - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -170,6 +170,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -178,20 +190,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..5548e79a3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_03_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +37,12 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_03_vlan_requirements: + type: list required: true - port_pd01_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_03_related_networks: type: list required: true entry_schema: @@ -39,98 +50,90 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd01_port_03_subnetpoolid: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_03_order: + type: integer required: true - port_pd01_port_vlan_requirements: + port_pd01_port_03_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd01_port_03_network_role_tag: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_03: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_03_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_03_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_03_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_03_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_03_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_03_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_03_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_03_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_03_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_03_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + network.outgoing.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outpoing.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + feature_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - feature disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +185,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +197,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment + network.incoming.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes disk.capacity_pd_server: - pd_server - disk.capacity @@ -215,27 +212,33 @@ topology_template: binding_pd_server: - pd_server - binding + binding_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes.rate + attachment_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - attachment feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,24 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + forwarder_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - forwarder disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.incoming.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_03: + - pd_server_pd01_port_03 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index c46b8e7c0f..8dd1090b25 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_03_network_role_tag: + type: string + required: true + port_pd02_port_03_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_pd02_port_order: + port_pd02_port_03_order: type: integer required: true - port_pd02_port_subnetpoolid: + port_pd02_port_03_network_role: type: string required: true - port_pd02_port_network_role_tag: + vm_flavor_name: type: string required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role: + port_pd02_port_03_subnetpoolid: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_03_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: string + port_pd02_port_03_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: + port_pd02_port_03_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_03: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_03_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_03_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_03_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_03_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_03_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_03_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_03_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_03_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_03_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_03_network - index_value requirements: - binding: @@ -131,12 +131,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.bytes.rate scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.incoming.bytes_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.bytes + binding_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -152,6 +161,12 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.incoming.packets.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.packets.rate + attachment_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - attachment cpu_pd_server: - pd_server - cpu @@ -164,15 +179,12 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.outgoing.bytes.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +194,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port - - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -203,12 +203,12 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,24 +218,30 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.bytes + forwarder_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.packets_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.packets + network.outpoing.packets_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outpoing.packets feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets disk.write.bytes_pd_server: - pd_server - disk.write.bytes @@ -260,9 +266,9 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + feature_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -275,9 +281,6 @@ topology_template: disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +290,16 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link + dependency_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml index 7ecfd2d3ca..cf7af8017b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,6 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_02_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +21,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd02_port_02_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -28,41 +36,38 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_02_network_role: + type: string required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + port_pd02_port_02_subnetpoolid: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_vlan_requirements: + port_pd02_port_02_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_02_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + port_pd02_port_02_network: type: list required: true entry_schema: @@ -72,11 +77,6 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_02_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_02_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_02_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_02_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_02_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_02_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_02_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_02_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_02_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_02_network - index_value requirements: - binding: @@ -131,15 +131,24 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_2 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.bytes.rate scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.incoming.bytes_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.bytes memory.usage_pd_server: - pd_server - memory.usage + binding_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - binding memory_pd_server: - pd_server - memory @@ -152,9 +161,15 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.incoming.packets.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.packets.rate cpu_pd_server: - pd_server - cpu + attachment_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - attachment cpu_util_pd_server: - pd_server - cpu_util @@ -164,15 +179,12 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.outgoing.bytes.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +194,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port - - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -203,39 +203,45 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.bytes binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.packets_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.packets + network.outpoing.packets_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outpoing.packets feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets disk.write.bytes_pd_server: - pd_server - disk.write.bytes @@ -260,9 +266,9 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + feature_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -275,9 +281,6 @@ topology_template: disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +290,16 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link + dependency_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml index a802e130ad..e2187dccf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_02_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,50 +36,42 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_02_network_role: + type: string required: true - port_pd01_port_related_networks: - type: list + port_pd01_port_02_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_02_network_role_tag: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_02_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd01_port_02_subnetpoolid: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_02_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_02_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_02_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_02_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_02_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_02_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_02_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_02_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_02_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_02_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_02_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_3 capabilities: + network.outgoing.bytes_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os + network.outpoing.packets_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outpoing.packets disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +173,18 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + feature_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - feature memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +197,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,30 +206,39 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.bytes binding_pd_server: - pd_server - binding + binding_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + attachment_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - attachment disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.incoming.packets.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.packets.rate + network.outgoing.bytes.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + forwarder_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - forwarder disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,22 +284,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.incoming.packets_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_02: + - pd_server_pd01_port_02 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml index 752fc03a07..ad592f067c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_01_network_role_tag: + type: string + required: true + port_pd01_port_01_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_01_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,46 +44,30 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_01_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_01_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_network_role: + port_pd01_port_01_subnetpoolid: type: string required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_01_vlan_requirements: type: list required: true entry_schema: @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_01_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_01_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_01_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_01_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_01_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_01_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_01_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_01_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_01_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_01_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_4 capabilities: + network.outgoing.bytes_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outpoing.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +173,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +182,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +194,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment + feature_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - feature disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,30 +206,39 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.bytes + binding_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - binding binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + attachment_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - attachment disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.incoming.packets.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.packets.rate + network.outgoing.bytes.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate + forwarder_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - forwarder disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,22 +284,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.incoming.packets_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_01: + - pd_server_pd01_port_01 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml index 6e87a88d97..5e1e46fd42 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_ps02_port_01_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,11 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps02_port_ip_requirements: + port_ps02_port_01_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_ps02_port_01_order: + type: integer + required: true compute_pd_server_availability_zone: type: list required: true @@ -33,101 +41,93 @@ topology_template: required: true entry_schema: type: string - port_ps02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps02_port_01_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_ps02_port_network_role_tag: + vm_image_name: type: string required: true - port_ps02_port_network_role: + port_ps02_port_01_network_role: type: string required: true - port_ps02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_image_name: + port_ps02_port_01_network_role_tag: type: string required: true - port_ps02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps02_port_subnetpoolid: - type: string + port_ps02_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps02_port_order: - type: integer + port_ps02_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - compute_pd_server_user_data_format: + port_ps02_port_01_network: type: list required: true entry_schema: type: string - port_ps02_port_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_ps02_port_01_subnetpoolid: + type: string + required: true node_templates: - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_ps02_port: + pd_server_ps02_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps02_port_exCP_naming + get_input: port_ps02_port_01_exCP_naming vlan_requirements: - get_input: port_ps02_port_vlan_requirements + get_input: port_ps02_port_01_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_ps02_port_related_networks + get_input: port_ps02_port_01_related_networks ip_requirements: - get_input: port_ps02_port_ip_requirements + get_input: port_ps02_port_01_ip_requirements network_role_tag: - get_input: port_ps02_port_network_role_tag + get_input: port_ps02_port_01_network_role_tag mac_requirements: - get_input: port_ps02_port_mac_requirements + get_input: port_ps02_port_01_mac_requirements order: - get_input: port_ps02_port_order + get_input: port_ps02_port_01_order network_role: - get_input: port_ps02_port_network_role + get_input: port_ps02_port_01_network_role subnetpoolid: - get_input: port_ps02_port_subnetpoolid + get_input: port_ps02_port_01_subnetpoolid network: get_input: - - port_ps02_port_network + - port_ps02_port_01_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_5 capabilities: @@ -137,9 +137,6 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_ps02_port: - - pd_server_ps02_port - - binding memory.usage_pd_server: - pd_server - memory.usage @@ -149,9 +146,9 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.incoming.bytes.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.packets.rate os_pd_server: - pd_server - os @@ -173,15 +170,21 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.incoming.packets.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.packets.rate memory.resident_pd_server: - pd_server - memory.resident + attachment_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - attachment cpu.delta_pd_server: - pd_server - cpu.delta @@ -194,30 +197,30 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.incoming.bytes_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.bytes endpoint_pd_server: - pd_server - endpoint disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.bytes_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.bytes disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation + feature_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - feature binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests - attachment_pd_server_ps02_port: - - pd_server_ps02_port - - attachment feature_pd_server: - pd_server - feature @@ -227,12 +230,6 @@ topology_template: disk.write.bytes_pd_server: - pd_server - disk.write.bytes - feature_pd_server_ps02_port: - - pd_server_ps02_port - - feature - network.outgoing.bytes.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -245,9 +242,6 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outgoing.packets.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.packets.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,36 +251,42 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_ps02_port: - - pd_server_ps02_port - - network.outpoing.packets + network.incoming.bytes.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.bytes.rate + network.outgoing.bytes_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.bytes + forwarder_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - forwarder + network.outgoing.bytes.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size - network.outgoing.bytes_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.bytes disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - forwarder_pd_server_ps02_port: - - pd_server_ps02_port - - forwarder + network.incoming.packets_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.packets + binding_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - binding disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.incoming.packets_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_ps02_port: - - pd_server_ps02_port + link_pd_server_ps02_port_01: + - pd_server_ps02_port_01 - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_ps02_port: - - pd_server_ps02_port - - dependency
\ No newline at end of file + dependency_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml index 1289e6e812..fddf5efbed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +33,50 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string + required: true + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_6 capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -152,6 +155,9 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -167,12 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +185,9 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -206,9 +200,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,9 +209,6 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding @@ -233,12 +221,18 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -251,6 +245,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -260,24 +257,27 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +287,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml index 4c81d47d18..7e40cdd1bb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_7 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml index c51dcc3d09..db8d29c093 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -62,28 +62,28 @@ topology_template: directives: - substitutable properties: + port_pd01_port_01_network_role_tag: oam + port_pd01_port_01_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 + port_pd01_port_01_network: + - get_input: oam_net_name vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -99,7 +99,7 @@ topology_template: directives: - substitutable properties: - port_ps02_port_ip_requirements: + port_ps02_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -111,18 +111,18 @@ topology_template: - get_input: - pd_server_names - 1 - port_ps02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_ps02_port_network_role_tag: oam vm_image_name: get_input: pd_image_name + port_ps02_port_01_network_role_tag: oam + port_ps02_port_01_mac_requirements: + mac_count_required: + is_required: false + port_ps02_port_01_network: + - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_ps02_port_network: - - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_pd_server_5ServiceTemplate.yaml count: 1 @@ -194,16 +194,16 @@ topology_template: - disk.device.write.bytes_server_pd_32_test_nested3Level feature_ps02_port_01: - abstract_pd_server_5 - - feature_pd_server_ps02_port + - feature_pd_server_ps02_port_01 disk.usage_server_pd_21_test_nested2Level: - test_nested2Level - disk.usage_server_pd_21 network.incoming.packets.rate_ps02_port_01: - abstract_pd_server_5 - - network.incoming.packets.rate_pd_server_ps02_port + - network.incoming.packets.rate_pd_server_ps02_port_01 network.outgoing.bytes_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_01 disk.device.read.bytes.rate_server_pd_11: - abstract_pd_server_4 - disk.device.read.bytes.rate_pd_server @@ -218,7 +218,7 @@ topology_template: - disk.device.write.bytes_server_pd_31_test_nested3Level network.incoming.bytes.rate_ps02_port_01: - abstract_pd_server_5 - - network.incoming.bytes.rate_pd_server_ps02_port + - network.incoming.bytes.rate_pd_server_ps02_port_01 disk.device.read.requests_server_pd_11: - abstract_pd_server_4 - disk.device.read.requests_pd_server @@ -251,7 +251,7 @@ topology_template: - attachment_pd01_port_02 network.incoming.bytes_ps02_port_01: - abstract_pd_server_5 - - network.incoming.bytes_pd_server_ps02_port + - network.incoming.bytes_pd_server_ps02_port_01 feature_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - feature_server_pd_32_test_nested3Level @@ -263,7 +263,7 @@ topology_template: - disk.read.requests_server_pd_31_test_nested3Level attachment_pd01_port_01: - abstract_pd_server_4 - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_01 disk.write.bytes.rate_server_pd_21_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_pd_21 @@ -299,13 +299,13 @@ topology_template: - disk.usage_server_pd_32_test_nested3Level binding_pd01_port_01: - abstract_pd_server_4 - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_01 disk.latency_server_pd_22_test_nested2Level: - test_nested2Level - disk.latency_server_pd_22 binding_ps02_port_01: - abstract_pd_server_5 - - binding_pd_server_ps02_port + - binding_pd_server_ps02_port_01 disk.read.requests_server_pd_21_test_nested2Level: - test_nested2Level - disk.read.requests_server_pd_21 @@ -374,7 +374,7 @@ topology_template: - disk.device.read.bytes_pd_server network.incoming.bytes.rate_pd01_port_01: - abstract_pd_server_4 - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_01 endpoint_server_pd_12: - abstract_pd_server_5 - endpoint_pd_server @@ -413,7 +413,7 @@ topology_template: - disk.latency_pd_server network.outgoing.bytes_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.bytes_pd_server_ps02_port + - network.outgoing.bytes_pd_server_ps02_port_01 disk.device.write.requests.rate_server_pd_21_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_pd_21 @@ -446,7 +446,7 @@ topology_template: - endpoint_server_pd_31_test_nested3Level network.outgoing.bytes.rate_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_01 disk.write.requests_server_pd_21_test_nested2Level: - test_nested2Level - disk.write.requests_server_pd_21 @@ -476,7 +476,7 @@ topology_template: - disk.device.allocation_pd_server network.outgoing.packets.rate_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_01 disk.device.latency_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.latency_server_pd_32_test_nested3Level @@ -524,7 +524,7 @@ topology_template: - feature_pd01_port_03_test_nested3Level network.outgoing.packets.rate_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.packets.rate_pd_server_ps02_port + - network.outgoing.packets.rate_pd_server_ps02_port_01 network.outgoing.bytes_pd01_port_03_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_pd01_port_03_test_nested3Level @@ -581,7 +581,7 @@ topology_template: - network.outgoing.bytes_pd02_port_02 network.outpoing.packets_pd01_port_01: - abstract_pd_server_4 - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_01 disk.allocation_server_pd_31_test_nested3Level_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_31_test_nested3Level @@ -611,7 +611,7 @@ topology_template: - network.outpoing.packets_pd01_port_03_test_nested3Level attachment_ps02_port_01: - abstract_pd_server_5 - - attachment_pd_server_ps02_port + - attachment_pd_server_ps02_port_01 network.incoming.bytes.rate_pd02_port_03_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_pd02_port_03_test_nested3Level @@ -731,7 +731,7 @@ topology_template: - network.incoming.packets.rate_pd01_port_02 network.incoming.packets_ps02_port_01: - abstract_pd_server_5 - - network.incoming.packets_pd_server_ps02_port + - network.incoming.packets_pd_server_ps02_port_01 disk.device.iops_server_pd_31_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.iops_server_pd_31_test_nested3Level @@ -761,13 +761,13 @@ topology_template: - disk.root.size_server_pd_31_test_nested3Level network.outgoing.bytes.rate_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.bytes.rate_pd_server_ps02_port + - network.outgoing.bytes.rate_pd_server_ps02_port_01 disk.iops_server_pd_22_test_nested2Level: - test_nested2Level - disk.iops_server_pd_22 feature_pd01_port_01: - abstract_pd_server_4 - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_01 disk.device.write.bytes.rate_server_pd_12: - abstract_pd_server_5 - disk.device.write.bytes.rate_pd_server @@ -803,10 +803,10 @@ topology_template: - binding_server_pd_21 network.incoming.packets_pd01_port_01: - abstract_pd_server_4 - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_01 network.incoming.packets.rate_pd01_port_01: - abstract_pd_server_4 - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_01 cpu_util_server_pd_12: - abstract_pd_server_5 - cpu_util_pd_server @@ -926,10 +926,10 @@ topology_template: - scalable_server_pd_31_test_nested3Level network.incoming.bytes_pd01_port_01: - abstract_pd_server_4 - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_01 network.outpoing.packets_ps02_port_01: - abstract_pd_server_5 - - network.outpoing.packets_pd_server_ps02_port + - network.outpoing.packets_pd_server_ps02_port_01 disk.device.write.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_pd_32_test_nested3Level @@ -1076,13 +1076,13 @@ topology_template: - vcpus_pd_server forwarder_ps02_port_01: - abstract_pd_server_5 - - forwarder_pd_server_ps02_port + - forwarder_pd_server_ps02_port_01 disk.device.write.bytes_server_pd_11: - abstract_pd_server_4 - disk.device.write.bytes_pd_server forwarder_pd01_port_01: - abstract_pd_server_4 - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_01 disk.allocation_server_pd_11: - abstract_pd_server_4 - disk.allocation_pd_server @@ -1143,10 +1143,10 @@ topology_template: - dependency_server_pd_22 dependency_ps02_port_01: - abstract_pd_server_5 - - dependency_pd_server_ps02_port + - dependency_pd_server_ps02_port_01 dependency_pd01_port_01: - abstract_pd_server_4 - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_01 local_storage_server_pd_11: - abstract_pd_server_4 - local_storage_pd_server @@ -1164,7 +1164,7 @@ topology_template: - dependency_pd02_port_03_test_nested3Level link_pd01_port_01: - abstract_pd_server_4 - - link_pd_server_pd01_port + - link_pd_server_pd01_port_01 local_storage_server_pd_12: - abstract_pd_server_5 - local_storage_pd_server @@ -1179,7 +1179,7 @@ topology_template: - dependency_pd01_port_02 link_ps02_port_01: - abstract_pd_server_5 - - link_pd_server_ps02_port + - link_pd_server_ps02_port_01 dependency_server_pd_12: - abstract_pd_server_5 - dependency_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml index 64678af2fe..568252d1f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -71,27 +71,27 @@ topology_template: directives: - substitutable properties: + port_pd02_port_02_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_pd02_port_02_network_role_tag: oam + port_pd02_port_02_mac_requirements: + mac_count_required: is_required: false - port_pd02_port_network: + port_pd02_port_02_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW @@ -116,20 +116,20 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_02_network_role_tag: oam + port_pd01_port_02_network: + - get_input: oam_net_name + port_pd01_port_02_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_02_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -206,7 +206,7 @@ topology_template: - memory.usage_pd_server network.outgoing.bytes_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_02 disk.device.read.bytes.rate_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.bytes.rate_server_pd_31 @@ -218,7 +218,7 @@ topology_template: - disk.read.requests_server_pd_32 network.incoming.packets.rate_pd02_port_02: - abstract_pd_server_2 - - network.incoming.packets.rate_pd_server_pd02_port + - network.incoming.packets.rate_pd_server_pd02_port_02 network.outpoing.packets_pd02_port_03_test_nested3Level: - test_nested3Level - network.outpoing.packets_pd02_port_03 @@ -227,7 +227,7 @@ topology_template: - disk.read.bytes.rate_server_pd_31 feature_pd02_port_02: - abstract_pd_server_2 - - feature_pd_server_pd02_port + - feature_pd_server_pd02_port_02 disk.read.bytes.rate_server_pd_32_test_nested3Level: - test_nested3Level - disk.read.bytes.rate_server_pd_32 @@ -236,10 +236,10 @@ topology_template: - disk.write.requests.rate_server_pd_31 attachment_pd01_port_02: - abstract_pd_server_3 - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_02 binding_pd01_port_02: - abstract_pd_server_3 - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_02 disk.allocation_server_pd_32_test_nested3Level: - test_nested3Level - disk.allocation_server_pd_32 @@ -257,13 +257,13 @@ topology_template: - disk.device.iops_server_pd_32 network.outpoing.packets_pd02_port_02: - abstract_pd_server_2 - - network.outpoing.packets_pd_server_pd02_port + - network.outpoing.packets_pd_server_pd02_port_02 network.incoming.bytes_pd01_port_03_test_nested3Level: - test_nested3Level - network.incoming.bytes_pd01_port_03 network.incoming.bytes.rate_pd02_port_02: - abstract_pd_server_2 - - network.incoming.bytes.rate_pd_server_pd02_port + - network.incoming.bytes.rate_pd_server_pd02_port_02 host_server_pd_31_test_nested3Level: - test_nested3Level - host_server_pd_31 @@ -296,10 +296,10 @@ topology_template: - memory_server_pd_32 network.incoming.bytes.rate_pd01_port_02: - abstract_pd_server_3 - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_02 binding_pd02_port_02: - abstract_pd_server_2 - - binding_pd_server_pd02_port + - binding_pd_server_pd02_port_02 memory.resident_server_pd_21: - abstract_pd_server_3 - memory.resident_pd_server @@ -338,7 +338,7 @@ topology_template: - disk.device.read.bytes_server_pd_32 network.incoming.packets_pd02_port_02: - abstract_pd_server_2 - - network.incoming.packets_pd_server_pd02_port + - network.incoming.packets_pd_server_pd02_port_02 disk.device.read.bytes_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.bytes_server_pd_31 @@ -353,7 +353,7 @@ topology_template: - forwarder_pd02_port_03 network.outgoing.bytes.rate_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_02 disk.device.write.requests.rate_server_pd_21: - abstract_pd_server_3 - disk.device.write.requests.rate_pd_server @@ -392,10 +392,10 @@ topology_template: - os_server_pd_32 network.outgoing.packets.rate_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_02 network.incoming.bytes_pd02_port_02: - abstract_pd_server_2 - - network.incoming.bytes_pd_server_pd02_port + - network.incoming.bytes_pd_server_pd02_port_02 endpoint_server_pd_22: - abstract_pd_server_2 - endpoint_pd_server @@ -455,16 +455,16 @@ topology_template: - memory_pd_server network.outgoing.packets.rate_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.packets.rate_pd_server_pd02_port + - network.outgoing.packets.rate_pd_server_pd02_port_02 disk.device.write.requests_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_pd_31 attachment_pd02_port_02: - abstract_pd_server_2 - - attachment_pd_server_pd02_port + - attachment_pd_server_pd02_port_02 network.outpoing.packets_pd01_port_02: - abstract_pd_server_3 - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_02 network.incoming.packets_pd02_port_03_test_nested3Level: - test_nested3Level - network.incoming.packets_pd02_port_03 @@ -524,7 +524,7 @@ topology_template: - disk.write.requests.rate_pd_server forwarder_pd02_port_02: - abstract_pd_server_2 - - forwarder_pd_server_pd02_port + - forwarder_pd_server_pd02_port_02 disk.device.latency_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.latency_server_pd_31 @@ -560,7 +560,7 @@ topology_template: - disk.device.write.requests_pd_server feature_pd01_port_02: - abstract_pd_server_3 - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_02 memory.usage_server_pd_31_test_nested3Level: - test_nested3Level - memory.usage_server_pd_31 @@ -569,7 +569,7 @@ topology_template: - disk.read.bytes_server_pd_32 network.outgoing.bytes_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.bytes_pd_server_pd02_port + - network.outgoing.bytes_pd_server_pd02_port_02 disk.device.read.requests.rate_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_pd_31 @@ -590,10 +590,10 @@ topology_template: - disk.latency_server_pd_31 network.incoming.packets.rate_pd01_port_02: - abstract_pd_server_3 - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_02 network.incoming.packets_pd01_port_02: - abstract_pd_server_3 - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_02 disk.iops_server_pd_22: - abstract_pd_server_2 - disk.iops_pd_server @@ -671,7 +671,7 @@ topology_template: - cpu_server_pd_32 network.incoming.bytes_pd01_port_02: - abstract_pd_server_3 - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_02 cpu_util_server_pd_32_test_nested3Level: - test_nested3Level - cpu_util_server_pd_32 @@ -782,10 +782,10 @@ topology_template: - network.outgoing.bytes.rate_pd02_port_03 forwarder_pd01_port_02: - abstract_pd_server_3 - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_02 network.outgoing.bytes.rate_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.bytes.rate_pd_server_pd02_port + - network.outgoing.bytes.rate_pd_server_pd02_port_02 disk.device.allocation_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.allocation_server_pd_31 @@ -804,7 +804,7 @@ topology_template: - link_pd01_port_03 link_pd02_port_02: - abstract_pd_server_2 - - link_pd_server_pd02_port + - link_pd_server_pd02_port_02 dependency_pd02_port_03_test_nested3Level: - test_nested3Level - dependency_pd02_port_03 @@ -813,7 +813,7 @@ topology_template: - dependency_server_pd_31 link_pd01_port_02: - abstract_pd_server_3 - - link_pd_server_pd01_port + - link_pd_server_pd01_port_02 dependency_server_pd_22: - abstract_pd_server_2 - dependency_pd_server @@ -825,7 +825,7 @@ topology_template: - link_pd02_port_03 dependency_pd02_port_02: - abstract_pd_server_2 - - dependency_pd_server_pd02_port + - dependency_pd_server_pd02_port_02 dependency_server_pd_21: - abstract_pd_server_3 - dependency_pd_server @@ -843,4 +843,4 @@ topology_template: - dependency dependency_pd01_port_02: - abstract_pd_server_3 - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_02 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml index 6a84a53e6e..f8357e678b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -62,6 +62,9 @@ topology_template: directives: - substitutable properties: + port_pd01_port_03_mac_requirements: + mac_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -70,20 +73,17 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + vm_image_name: + get_input: pd_image_name + port_pd01_port_03_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam + port_pd01_port_03_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -99,28 +99,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_03_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_03_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: + port_pd02_port_03_network: + - get_input: oam_net_name + port_pd02_port_03_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd02_port_network: - - get_input: oam_net_name compute_pd_server_user_data_format: - RAW service_template_filter: @@ -145,7 +145,7 @@ topology_template: capabilities: attachment_pd02_port_03: - abstract_pd_server_1 - - attachment_pd_server_pd02_port + - attachment_pd_server_pd02_port_03 disk.root.size_server_pd_31: - abstract_pd_server - disk.root.size_pd_server @@ -154,7 +154,7 @@ topology_template: - disk.root.size_pd_server network.outgoing.packets.rate_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.packets.rate_pd_server_pd02_port + - network.outgoing.packets.rate_pd_server_pd02_port_03 disk.iops_server_pd_32: - abstract_pd_server_1 - disk.iops_pd_server @@ -163,7 +163,7 @@ topology_template: - disk.iops_pd_server network.outpoing.packets_pd01_port_03: - abstract_pd_server - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_03 disk.device.write.bytes.rate_server_pd_32: - abstract_pd_server_1 - disk.device.write.bytes.rate_pd_server @@ -172,7 +172,7 @@ topology_template: - disk.device.write.bytes.rate_pd_server network.outgoing.bytes_pd01_port_03: - abstract_pd_server - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_03 disk.write.requests_server_pd_32: - abstract_pd_server_1 - disk.write.requests_pd_server @@ -187,7 +187,7 @@ topology_template: - disk.read.bytes_pd_server network.incoming.packets.rate_pd02_port_03: - abstract_pd_server_1 - - network.incoming.packets.rate_pd_server_pd02_port + - network.incoming.packets.rate_pd_server_pd02_port_03 cpu_util_server_pd_31: - abstract_pd_server - cpu_util_pd_server @@ -205,7 +205,7 @@ topology_template: - disk.device.write.bytes_pd_server feature_pd02_port_03: - abstract_pd_server_1 - - feature_pd_server_pd02_port + - feature_pd_server_pd02_port_03 disk.device.write.bytes_server_pd_31: - abstract_pd_server - disk.device.write.bytes_pd_server @@ -217,7 +217,7 @@ topology_template: - memory.usage_pd_server forwarder_pd02_port_03: - abstract_pd_server_1 - - forwarder_pd_server_pd02_port + - forwarder_pd_server_pd02_port_03 disk.read.bytes.rate_server_pd_31: - abstract_pd_server - disk.read.bytes.rate_pd_server @@ -226,10 +226,10 @@ topology_template: - disk.read.bytes.rate_pd_server binding_pd01_port_03: - abstract_pd_server - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_03 attachment_pd01_port_03: - abstract_pd_server - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_03 disk.device.read.bytes_server_pd_32: - abstract_pd_server_1 - disk.device.read.bytes_pd_server @@ -265,10 +265,10 @@ topology_template: - disk.read.requests_pd_server network.outgoing.bytes_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.bytes_pd_server_pd02_port + - network.outgoing.bytes_pd_server_pd02_port_03 network.outpoing.packets_pd02_port_03: - abstract_pd_server_1 - - network.outpoing.packets_pd_server_pd02_port + - network.outpoing.packets_pd_server_pd02_port_03 disk.device.write.requests.rate_server_pd_31: - abstract_pd_server - disk.device.write.requests.rate_pd_server @@ -277,7 +277,7 @@ topology_template: - disk.device.write.requests.rate_pd_server network.incoming.bytes.rate_pd02_port_03: - abstract_pd_server_1 - - network.incoming.bytes.rate_pd_server_pd02_port + - network.incoming.bytes.rate_pd_server_pd02_port_03 scalable_server_pd_32: - abstract_pd_server_1 - scalable_pd_server @@ -289,7 +289,7 @@ topology_template: - disk.device.write.requests_pd_server network.incoming.packets.rate_pd01_port_03: - abstract_pd_server - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_03 disk.device.write.requests_server_pd_31: - abstract_pd_server - disk.device.write.requests_pd_server @@ -298,7 +298,7 @@ topology_template: - disk.device.latency_pd_server network.incoming.packets_pd01_port_03: - abstract_pd_server - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_03 disk.device.usage_server_pd_31: - abstract_pd_server - disk.device.usage_pd_server @@ -307,7 +307,7 @@ topology_template: - disk.device.usage_pd_server feature_pd01_port_03: - abstract_pd_server - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_03 disk.device.read.requests_server_pd_32: - abstract_pd_server_1 - disk.device.read.requests_pd_server @@ -322,10 +322,10 @@ topology_template: - disk.device.read.requests_pd_server network.incoming.bytes.rate_pd01_port_03: - abstract_pd_server - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_03 binding_pd02_port_03: - abstract_pd_server_1 - - binding_pd_server_pd02_port + - binding_pd_server_pd02_port_03 disk.capacity_server_pd_32: - abstract_pd_server_1 - disk.capacity_pd_server @@ -334,13 +334,13 @@ topology_template: - disk.capacity_pd_server network.incoming.bytes_pd01_port_03: - abstract_pd_server - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_03 vcpus_server_pd_31: - abstract_pd_server - vcpus_pd_server network.incoming.packets_pd02_port_03: - abstract_pd_server_1 - - network.incoming.packets_pd_server_pd02_port + - network.incoming.packets_pd_server_pd02_port_03 disk.usage_server_pd_32: - abstract_pd_server_1 - disk.usage_pd_server @@ -358,7 +358,7 @@ topology_template: - memory.resident_pd_server network.outgoing.bytes.rate_pd01_port_03: - abstract_pd_server - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_03 cpu_server_pd_32: - abstract_pd_server_1 - cpu_pd_server @@ -400,13 +400,13 @@ topology_template: - disk.write.requests.rate_pd_server network.outgoing.packets.rate_pd01_port_03: - abstract_pd_server - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_03 memory_server_pd_32: - abstract_pd_server_1 - memory_pd_server network.incoming.bytes_pd02_port_03: - abstract_pd_server_1 - - network.incoming.bytes_pd_server_pd02_port + - network.incoming.bytes_pd_server_pd02_port_03 memory_server_pd_31: - abstract_pd_server - memory_pd_server @@ -430,7 +430,7 @@ topology_template: - instance_pd_server forwarder_pd01_port_03: - abstract_pd_server - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_03 disk.device.allocation_server_pd_31: - abstract_pd_server - disk.device.allocation_pd_server @@ -451,7 +451,7 @@ topology_template: - binding_pd_server network.outgoing.bytes.rate_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.bytes.rate_pd_server_pd02_port + - network.outgoing.bytes.rate_pd_server_pd02_port_03 disk.write.bytes.rate_server_pd_32: - abstract_pd_server_1 - disk.write.bytes.rate_pd_server @@ -476,13 +476,13 @@ topology_template: - local_storage_pd_server link_pd02_port_03: - abstract_pd_server_1 - - link_pd_server_pd02_port + - link_pd_server_pd02_port_03 dependency_pd02_port_03: - abstract_pd_server_1 - - dependency_pd_server_pd02_port + - dependency_pd_server_pd02_port_03 link_pd01_port_03: - abstract_pd_server - - link_pd_server_pd01_port + - link_pd_server_pd01_port_03 dependency_pd01_port_03: - abstract_pd_server - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_03 |