diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out')
5 files changed, 631 insertions, 631 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index a16a063daa..d3d5fbba28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_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 @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,48 +48,42 @@ 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: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: 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_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED 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. @@ -148,12 +156,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: @@ -165,12 +167,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,13 +197,19 @@ 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: + network.incoming.packets.rate_pd_server_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -225,7 +227,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -254,12 +261,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + 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 - disk.capacity_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,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: + network.incoming.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + 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.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED 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. @@ -368,14 +385,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_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,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,12 +426,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. @@ -435,82 +435,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: 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_0_order: + type: integer 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_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 @@ -532,20 +532,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: @@ -575,12 +583,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: @@ -592,12 +594,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. @@ -628,7 +624,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: @@ -652,7 +648,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: @@ -670,6 +678,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. @@ -681,17 +694,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. @@ -715,6 +728,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: @@ -726,27 +745,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: @@ -776,6 +787,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. @@ -795,14 +812,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 @@ -824,11 +835,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. @@ -847,12 +853,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. @@ -862,26 +862,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_2_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_3_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_3_related_networks: + port_pd_server_2_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_2_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -894,50 +884,44 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_2_network_role_tag: - type: string + port_pd_server_2_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_3_ip_requirements: - type: list + port_pd_server_2_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_network: - type: list + port_pd_server_2_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_2_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_2_subnetpoolid: - type: string + port_pd_server_2_oam_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_3_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_2_network: + port_pd_server_0_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_0_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED compute_pd_server_user_data_format: @@ -946,13 +930,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_2_ip_requirements: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_order: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_order: type: integer required: true status: SUPPORTED @@ -964,32 +956,40 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_2_related_networks: + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_3_vlan_requirements: + type: string + port_pd_server_2_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_2_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_3_network_role_tag: - type: string + entry_schema: + type: string + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_2_oam_port_0_network_role: + type: string required: true status: SUPPORTED requirements: @@ -1007,27 +1007,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_2: + - dependency_pd_server_pd_server_2_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_2: + - link_pd_server_pd_server_2_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_3: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_3: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1045,47 +1045,32 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_2: - type: org.openecomp.capabilities.Forwarder + 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_pd01_port_2: - 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 - forwarder_pd_server_pd01_port_3: - type: org.openecomp.capabilities.Forwarder + 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. occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port_3: - 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: + disk.device.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 - memory_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_2_oam_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.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. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1100,6 +1085,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd_server_2_oam_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_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. @@ -1130,31 +1128,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_2: + network.outpoing.packets_pd_server_pd_server_2_oam_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.iops_pd_server: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port_3: + network.incoming.packets.rate_pd_server_pd_server_2_oam_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_3: + 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: @@ -1172,25 +1164,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_2: + network.outgoing.bytes_pd_server_pd_server_2_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_2: - type: tosca.capabilities.Attachment + feature_pd_server_pd_server_2_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_3: - type: tosca.capabilities.Attachment + forwarder_pd_server_pd_server_2_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1223,25 +1209,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port_2: + network.incoming.bytes_pd_server_pd_server_0_oam_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.allocation_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_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.allocation_pd_server: + 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 - network.incoming.packets_pd_server_pd01_port_3: + 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: @@ -1258,11 +1244,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -1275,33 +1263,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_3: + 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.outgoing.bytes.rate_pd_server_pd01_port_3: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_2: - 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_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1323,25 +1304,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.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.outpoing.packets_pd_server_pd01_port_2: + network.outgoing.bytes.rate_pd_server_pd_server_2_oam_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.outpoing.packets_pd_server_pd01_port_3: + network.incoming.bytes_pd_server_pd_server_2_oam_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: @@ -1366,23 +1341,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_3: - type: tosca.capabilities.Node + 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 - feature_pd_server_pd01_port_2: - type: tosca.capabilities.Node + 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.write.requests.rate_pd_server: + network.incoming.packets_pd_server_pd_server_2_oam_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: + network.incoming.bytes.rate_pd_server_pd_server_0_oam_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: @@ -1394,6 +1371,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.latency_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. @@ -1412,9 +1395,26 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd_server_2_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_2_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.iops_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.outpoing.packets_pd_server_pd_server_0_oam_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
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index f892137ee1..6be1a7887c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -327,6 +327,12 @@ topology_template: directives: - substitutable properties: + port_pd01_port_1_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: @@ -337,20 +343,14 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: + port_pd01_port_1_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: + port_pd01_port_1_network_role_tag: oam + port_pd01_port_1_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -376,34 +376,34 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: oam - port_pd01_port_3_ip_requirements: + port_pd_server_2_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_3_network: - - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_2_network: - - get_input: oam_net_name - port_pd01_port_2_mac_requirements: - mac_count_required: - is_required: false + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_2_ip_requirements: + port_pd_server_2_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_3_mac_requirements: + port_pd_server_2_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_2_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -422,6 +422,19 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_attribute: + - network_policy_server + - name + port_pd01_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: @@ -432,21 +445,8 @@ topology_template: get_attribute: - network_policy_server - 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_attribute: - - network_policy_server - - name 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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..734675faec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_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,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,39 +44,34 @@ 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: + port_pd01_port_1_network_role: 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_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string 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_1: 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_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -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,21 +170,27 @@ 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 + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate 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 + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,12 +203,15 @@ 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 + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets 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_1: + - pd_server_pd01_port_1 + - 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 + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes 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_1: + - pd_server_pd01_port_1 + - network.outgoing.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_1: + - pd_server_pd01_port_1 + - 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_1: + - pd_server_pd01_port_1 + - 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_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 34e182d166..6adf9df5ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.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_network_role_tag: + port_pd01_port_0_order: + type: integer + required: true + 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_1 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
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 7b93f4a508..f7e37a33ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,22 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_2_order: - type: integer - required: true - port_pd01_port_3_network_role: - type: string - required: true - port_pd01_port_3_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_2_vlan_requirements: + port_pd_server_2_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_availability_zone: type: list required: true @@ -37,53 +29,54 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: + port_pd_server_2_oam_port_0_order: + type: integer + required: true + port_pd_server_2_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_2_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_2_network_role_tag: + vm_flavor_name: type: string required: true - port_pd01_port_3_ip_requirements: + port_pd_server_2_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_2_network_role: - type: string - required: true - port_pd01_port_2_subnetpoolid: - type: string - required: true vm_image_name: type: string required: true - port_pd01_port_3_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_2_network: + port_pd_server_0_oam_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd01_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_0_oam_port_0_subnetpoolid: + type: string required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd01_port_2_ip_requirements: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_order: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + port_pd_server_0_oam_port_0_order: type: integer required: true index_value: @@ -93,28 +86,35 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_2_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_oam_port_0_network_role_tag: + type: string + required: true + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_2_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_3_vlan_requirements: + port_pd_server_2_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_3_network_role_tag: + port_pd_server_2_oam_port_0_network_role: type: string required: true - port_pd01_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_2: + pd_server_pd_server_2_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_2_exCP_naming + get_input: port_pd_server_2_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_2_vlan_requirements + get_input: port_pd_server_2_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_2_related_networks + get_input: port_pd_server_2_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_2_ip_requirements + get_input: port_pd_server_2_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_2_network_role_tag + get_input: port_pd_server_2_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_2_mac_requirements + get_input: port_pd_server_2_oam_port_0_mac_requirements order: - get_input: port_pd01_port_2_order + get_input: port_pd_server_2_oam_port_0_order network_role: - get_input: port_pd01_port_2_network_role + get_input: port_pd_server_2_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_2_subnetpoolid + get_input: port_pd_server_2_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_2_network + - port_pd_server_2_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_3: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_3_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_3_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_3_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_3_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_3_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_3_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_3_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_3_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_3_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_3_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -206,18 +206,6 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - forwarder_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - forwarder - binding_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - binding - forwarder_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - forwarder - binding_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - binding memory.usage_pd_server: - pd_server - memory.usage @@ -227,12 +215,24 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + network.incoming.bytes.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.bytes.rate + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + binding_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - binding cpu_pd_server: - pd_server - cpu @@ -248,39 +248,33 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + network.outpoing.packets_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outpoing.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.bytes.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.packets.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outgoing.packets.rate - attachment_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - attachment - attachment_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - attachment + network.outgoing.bytes_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.bytes + feature_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - feature + forwarder_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - forwarder vcpus_pd_server: - pd_server - vcpus @@ -296,48 +290,45 @@ topology_template: disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.packets_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.bytes - network.incoming.bytes_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -347,18 +338,15 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.outgoing.bytes_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.bytes disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.bytes disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -368,21 +356,24 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - feature - feature_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.incoming.packets_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.packets + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -392,25 +383,34 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity + attachment_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - attachment + network.outgoing.packets.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.packets.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - link - link_pd_server_pd01_port_3: - - pd_server_pd01_port_3 + link_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - link - dependency_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_3: - - pd_server_pd01_port_3 + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency + dependency_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - dependency
\ No newline at end of file |