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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out')
6 files changed, 882 insertions, 882 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5a6cedc9f4..6d8d1684d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -20,143 +20,143 @@ node_types: status: SUPPORTED entry_schema: type: float - 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 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_related_networks: + 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 + port_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_1b: + - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -169,11 +169,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -193,28 +188,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: type: org.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_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 - forwarder_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - 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_1b_pd_server_1b_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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -233,14 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -264,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_server_1b_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.allocation_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -276,7 +266,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_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: @@ -306,14 +296,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -335,7 +326,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_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: @@ -352,7 +343,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -363,6 +354,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_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.root.size_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -375,6 +372,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -398,12 +405,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -415,15 +416,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_pd_server_1b: type: org.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_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -433,12 +438,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_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: @@ -462,25 +462,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: type: org.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_1b: + disk.usage_pd_server_1b: type: org.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_1b: + disk.write.requests.rate_pd_server_1b: type: org.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_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_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: @@ -582,14 +582,21 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_pd_server_1b_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_3: + - dependency_ps_server_1b_1_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_ps_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -673,13 +680,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port_3: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_server_1b_ps_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -703,14 +703,6 @@ node_types: occurrences: - 0 - UNBOUNDED - binding_ps_server_1b_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 disk.device.usage_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -746,11 +738,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -762,23 +749,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_pd_server_1b_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.outpoing.packets_pd_server_1b_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.iops_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -846,12 +822,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_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 instance_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -910,6 +880,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_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 disk.device.capacity_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -928,25 +904,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_3: + disk.device.iops_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_1b_ps_2: + network.outgoing.bytes_pd_server_1b_1_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.outgoing.bytes_pd_server_1b_port_2: + attachment_pd_server_1b_1_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_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.outgoing.bytes_pd_server_1b_port_3: + network.incoming.bytes.rate_ps_server_1b_1_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.outgoing.bytes_pd_server_1b_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: @@ -969,12 +956,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_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 feature_packet_int_network: type: tosca.capabilities.Node occurrences: @@ -1016,7 +997,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_port_3: + network.outpoing.packets_ps_server_1b_1_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: @@ -1028,13 +1009,19 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1b_1_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 disk.allocation_server_1b_ps_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.bytes.rate_pd_server_1b_port_3: + network.incoming.bytes_ps_server_1b_1_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: @@ -1098,31 +1085,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_1b_ps_2: + network.outpoing.packets_pd_server_1b_1_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.packets.rate_ps_server_1b_port_2: + disk.write.requests_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_1b_pd_3: + network.incoming.packets.rate_ps_server_1b_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 - disk.latency_server_1b_ps_3: + disk.root.size_server_1b_pd_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.incoming.packets.rate_ps_server_1b_port_3: + disk.latency_server_1b_ps_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: @@ -1192,19 +1179,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_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 - attachment_ps_server_1b_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED attachment_ps_server_1b_port_2: type: tosca.capabilities.Attachment occurrences: @@ -1279,12 +1253,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_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.usage_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1434,12 +1402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_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.root.size_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1488,12 +1450,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_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 attachment_packet_int_network: type: tosca.capabilities.Attachment occurrences: @@ -1612,11 +1568,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_server_1b_pd_3: type: tosca.capabilities.Node occurrences: @@ -1671,7 +1622,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_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.outgoing.packets.rate_pd_server_1b_1_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: @@ -1683,12 +1640,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_1b_1_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 disk.write.requests.rate_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1b_1_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 + attachment_ps_server_1b_1_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1736,11 +1710,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1793,11 +1762,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_1_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 feature_server_1b_ps_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_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 feature_server_1b_ps_3: type: tosca.capabilities.Node occurrences: @@ -1861,24 +1842,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_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.incoming.bytes_pd_server_1b_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_1b_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 memory_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1915,28 +1884,66 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_1_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_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_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 disk.device.latency_server_1b_pd_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 + binding_ps_server_1b_1_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 scalable_server_1b_pd_3: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_1_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_server_1b_pd_2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_1_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 cpu.delta_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1955,9 +1962,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_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. + feature_pd_server_1b_1_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1973,25 +1979,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_1b_ps_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_server_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_1b_ps_3: + disk.device.read.bytes_server_1b_ps_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_1b_port_2: + disk.device.read.bytes_server_1b_ps_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.incoming.bytes.rate_pd_server_1b_port_3: + network.incoming.bytes.rate_pd_server_1b_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: @@ -2002,11 +2007,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -2016,6 +2016,22 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2028,76 +2044,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + port_pd_server_1b_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_2_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_1b_availability_zone: - type: list + port_pd_server_1b_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: string requirements: - dependency_pd_server_1b: capability: tosca.capabilities.Node @@ -2113,14 +2113,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2133,8 +2133,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_1b_pd_server_1b_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 @@ -2157,29 +2158,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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.delta_pd_server_1b: type: org.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_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_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_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2197,7 +2181,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: + cpu_pd_server_1b: + type: org.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_1b_pd_server_1b_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2205,19 +2195,19 @@ node_types: occurrences: - 0 - UNBOUNDED - cpu_pd_server_1b: + disk.write.bytes.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_pd_server_1b: + disk.device.read.requests.rate_pd_server_1b: type: org.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_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_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: @@ -2234,13 +2224,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server_1b: + network.outpoing.packets_pd_server_1b_pd_server_1b_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.outpoing.packets_pd_server_1b_pd_server_1b_port: + memory.usage_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2276,8 +2266,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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 @@ -2299,7 +2290,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_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: @@ -2328,12 +2319,28 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_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 disk.iops_pd_server_1b: type: org.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_1b_pd_server_1b_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2357,12 +2364,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2380,25 +2381,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_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 memory.resident_pd_server_1b: type: org.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_1b_pd_server_1b_port: + disk.device.write.requests.rate_pd_server_1b: type: org.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_1b: + network.incoming.packets_pd_server_1b_pd_server_1b_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: @@ -2416,25 +2411,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: type: org.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_1b: + disk.usage_pd_server_1b: type: org.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_1b: + attachment_pd_server_1b_pd_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_pd_server_1b: type: org.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_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_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: @@ -2443,32 +2443,28 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2477,51 +2473,53 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED @@ -2533,10 +2531,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -2564,34 +2564,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2622,6 +2622,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_1b_ps_server_1b_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 cpu_util_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2633,6 +2639,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2651,12 +2662,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_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: @@ -2668,11 +2674,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2697,12 +2698,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_ps_server_1b_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 disk.device.read.requests_ps_server_1b: type: org.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_ps_server_1b_ps_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED host_ps_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -2722,11 +2734,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2739,7 +2746,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_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: @@ -2774,6 +2781,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2804,25 +2816,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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.incoming.packets_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2838,6 +2832,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2856,19 +2855,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + memory.usage_ps_server_1b: type: org.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_ps_server_1b: + binding_ps_server_1b_ps_server_1b_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 + disk.latency_ps_server_1b: type: org.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_ps_server_1b: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_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: @@ -2879,18 +2886,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + network.outpoing.packets_ps_server_1b_ps_server_1b_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 - feature_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node + vcpus_ps_server_1b: + type: org.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_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2908,15 +2916,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_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 - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_2: type: tosca.capabilities.Node occurrences: - 1 @@ -2987,4 +2987,4 @@ node_types: type: tosca.capabilities.Node 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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml index fa1596322b..e6cc52a094 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml @@ -137,29 +137,7 @@ topology_template: - 9 - 9 - 9 - vm_flavor_name: - get_input: pd_server_1b_flavor - subinterface_nested_vlan_net1: - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - - pd_server_1b_port_01 - - pd_server_1b_port_11 - - pd_server_1b_port_1 - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -176,22 +154,44 @@ topology_template: get_input: - pd_server_1b_ips - 1 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_1_port_1 + - pd_server_1b_2_port_1 + - pd_server_1b_3_port_1 + - pd_server_1b_port_1 + port_pd_server_1b_port_1_replacement_policy: + - AUTO + - AUTO + - AUTO + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 4 @@ -201,11 +201,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_internalmain_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_externalmain_network relationship: tosca.relationships.network.LinksTo @@ -237,4 +237,4 @@ topology_template: - packet_internalmain_network - test_nested_level1 - packet_externalmain_network - - abstract_pd_server_1b_1
\ No newline at end of file + - abstract_pd_server_1b_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index d0921140a5..e2354d22f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -16,6 +16,19 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,62 +39,49 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - vm_image_name: - type: string - required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + port_pd_server_1b_port_2_network_role_tag: + type: string required: true - entry_schema: - type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_2_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_network_role: + type: string required: true - port_pd_server_1b_port_exCP_naming: + port_pd_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_1b_port_2_order: + type: integer + required: true + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: string node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -98,39 +98,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_2_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_2_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_2_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_2_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_2_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_2_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_2_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_2_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_2_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_2_network - index_value requirements: - binding: @@ -143,9 +143,9 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature + network.incoming.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes host_pd_server_1b: - pd_server_1b - host @@ -155,18 +155,9 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -176,30 +167,33 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu + binding_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - binding disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets.rate endpoint_pd_server_1b: - pd_server_1b - endpoint disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation + network.outpoing.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outpoing.packets memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets memory_pd_server_1b: - pd_server_1b - memory @@ -215,9 +209,9 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes.rate disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -227,9 +221,9 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -242,9 +236,18 @@ topology_template: disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - forwarder + feature_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -257,9 +260,6 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -269,36 +269,36 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate + network.incoming.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets disk.device.capacity_pd_server_1b: - pd_server_1b - disk.device.capacity disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + attachment_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - attachment disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -306,9 +306,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + dependency_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - dependency + link_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 - link - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 9920d7e27f..3ee9e8faad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -21,108 +21,83 @@ topology_template: required: true entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_related_networks: + 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 + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port - relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b properties: @@ -138,54 +113,76 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_1b_pd_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b_1 capabilities: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,18 +192,15 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -216,9 +210,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -231,15 +222,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,12 +246,12 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -267,27 +261,36 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +303,26 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance binding_pd_server_1b: - pd_server_1b - binding + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,9 +333,6 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity @@ -345,6 +342,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + link_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..048e4146de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true - port_ps_server_1b_port_fixed_ips: + subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,42 +36,43 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true entry_schema: @@ -84,9 +82,11 @@ topology_template: required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -113,7 +113,7 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: + ps_server_1b_ps_server_1b_port_2_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -136,41 +136,41 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port + node: ps_server_1b_ps_server_1b_port_2 relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_2_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_2_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_2_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_2_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_2_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_2_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_2_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_2_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_2_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_2_network - index_value requirements: - binding: @@ -192,12 +192,18 @@ topology_template: disk.device.write.requests_ps_server_1b: - ps_server_1b - disk.device.write.requests + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outgoing.bytes cpu_util_ps_server_1b: - ps_server_1b - cpu_util scalable_ps_server_1b: - ps_server_1b - scalable + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate @@ -207,18 +213,12 @@ topology_template: disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -231,9 +231,15 @@ topology_template: disk.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.read.bytes.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets disk.device.read.requests_ps_server_1b: - ps_server_1b - disk.device.read.requests + attachment_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - attachment host_ps_server_1b: - ps_server_1b - host @@ -243,17 +249,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -270,6 +273,9 @@ topology_template: binding_ps_server_1b: - ps_server_1b - binding + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature memory.resident_ps_server_1b: - ps_server_1b - memory.resident @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets memory.usage_ps_server_1b: - ps_server_1b - memory.usage + binding_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - binding disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets.rate endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature + network.outpoing.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outpoing.packets vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - dependency + link_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - link + dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index 873ade14f4..8a89b5699d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -100,17 +100,7 @@ topology_template: - get_input: - pd_server_1b_names - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -119,18 +109,28 @@ topology_template: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_int_network - - packet_int_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + vm_flavor_name: + get_input: pd_server_1b_flavor + port_pd_server_1b_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pd_server_1b_port_2_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_pd_server_1b_port_2_mac_requirements: + mac_count_required: + is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 2 @@ -140,7 +140,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo @@ -159,13 +159,24 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_ps_server_1b_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - port_ps_server_1b_port_fixed_ips: + vm_flavor_name: + get_input: ps_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_ext_network + - packet_ext_network + port_ps_server_1b_port_2_fixed_ips: - - ip_address: get_input: - ps_server_1b_ips @@ -174,27 +185,16 @@ topology_template: get_input: - ps_server_1b_ips - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - - packet_ext_network - port_ps_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_2_mac_requirements: + mac_count_required: is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: - AUTO - AUTO subinterface_nested_vlan_parent_interface: - - ps_server_1b_port_3 + - ps_server_1b_1_port_2 - ps_server_1b_port_2 compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 @@ -215,11 +215,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -239,10 +239,7 @@ topology_template: capabilities: binding_ps_server_1b_port_2: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port - binding_ps_server_1b_port_3: - - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_2 disk.device.usage_server_1b_ps_2: - abstract_ps_server_1b - disk.device.usage_ps_server_1b @@ -257,28 +254,19 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b feature_pd_server_1b_port_2: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 disk.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.capacity_pd_server_1b - feature_pd_server_1b_port_3: - - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port disk.capacity_server_1b_pd_2: - abstract_pd_server_1b - disk.capacity_pd_server_1b forwarder_pd_server_1b_port_2: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port - forwarder_pd_server_1b_port_3: - - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - network.outpoing.packets_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.device.iops_server_1b_pd_3: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -312,15 +300,12 @@ topology_template: memory_server_1b_ps_2: - abstract_ps_server_1b - memory_ps_server_1b - network.outgoing.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port instance_server_1b_ps_3: - abstract_ps_server_1b - instance_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2 instance_server_1b_ps_2: - abstract_ps_server_1b - instance_ps_server_1b @@ -345,6 +330,9 @@ topology_template: disk.device.iops_server_1b_ps_3: - abstract_ps_server_1b - disk.device.iops_ps_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2 disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -353,19 +341,25 @@ topology_template: - disk.device.capacity_ps_server_1b network.incoming.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port - network.incoming.packets_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.device.iops_ps_server_1b - network.outgoing.bytes_pd_server_1b_port_2: + network.outgoing.bytes_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_pd_server_1b_port_3: + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 + attachment_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port_2 + network.incoming.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2 + network.outgoing.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 endpoint_server_1b_ps_3: - abstract_ps_server_1b - endpoint_ps_server_1b @@ -375,18 +369,15 @@ topology_template: host_server_1b_ps_2: - abstract_ps_server_1b - host_ps_server_1b - network.outgoing.bytes.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port feature_packet_int_network: - packet_int_network - feature network.outgoing.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 network.outgoing.packets.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2 memory.resident_server_1b_pd_2: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -399,18 +390,21 @@ topology_template: disk.device.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b - network.outgoing.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + network.outpoing.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 disk.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.allocation_ps_server_1b + network.incoming.bytes_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_ps_3: - abstract_ps_server_1b - disk.allocation_ps_server_1b - network.outgoing.bytes.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + network.incoming.bytes_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 vcpus_server_1b_ps_2: - abstract_ps_server_1b - vcpus_ps_server_1b @@ -419,7 +413,7 @@ topology_template: - vcpus_ps_server_1b network.outgoing.bytes.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2 disk.write.requests_server_1b_ps_3: - abstract_ps_server_1b - disk.write.requests_ps_server_1b @@ -441,21 +435,21 @@ topology_template: os_server_1b_pd_2: - abstract_pd_server_1b - os_pd_server_1b + network.outpoing.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2 disk.root.size_server_1b_pd_3: - abstract_pd_server_1b - disk.root.size_pd_server_1b disk.latency_server_1b_ps_3: - abstract_ps_server_1b - disk.latency_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_pd_2: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -489,15 +483,9 @@ topology_template: end_point_packet_int_network: - packet_int_network - end_point - binding_pd_server_1b_port_3: - - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port - attachment_ps_server_1b_port_3: - - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port attachment_ps_server_1b_port_2: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_server_1b_ps_3: - abstract_ps_server_1b - cpu_ps_server_1b @@ -506,7 +494,7 @@ topology_template: - attachment binding_pd_server_1b_port_2: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_pd_3: - abstract_pd_server_1b - disk.allocation_pd_server_1b @@ -533,10 +521,7 @@ topology_template: - feature network.outgoing.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port - network.outgoing.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 disk.usage_server_1b_ps_3: - abstract_ps_server_1b - disk.usage_ps_server_1b @@ -611,10 +596,7 @@ topology_template: - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2 disk.root.size_server_1b_ps_2: - abstract_ps_server_1b - disk.root.size_ps_server_1b @@ -638,10 +620,7 @@ topology_template: - disk.write.requests.rate_pd_server_1b network.incoming.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port - network.incoming.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 attachment_packet_int_network: - packet_int_network - attachment @@ -701,10 +680,7 @@ topology_template: - cpu_util_pd_server_1b forwarder_ps_server_1b_port_2: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_3: - - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_2 feature_server_1b_pd_3: - abstract_pd_server_1b - feature_pd_server_1b @@ -735,15 +711,27 @@ topology_template: end_point_packet_ext_network: - packet_ext_network - end_point - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 + network.outgoing.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2 disk.write.requests.rate_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests.rate_ps_server_1b + network.incoming.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 + attachment_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_util_server_1b_pd_3: - abstract_pd_server_1b - cpu_util_pd_server_1b @@ -755,7 +743,7 @@ topology_template: - disk.write.requests.rate_ps_server_1b attachment_pd_server_1b_port_2: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_2 disk.write.bytes_server_1b_ps_3: - abstract_ps_server_1b - disk.write.bytes_ps_server_1b @@ -768,9 +756,6 @@ topology_template: disk.device.write.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.write.bytes_ps_server_1b - attachment_pd_server_1b_port_3: - - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port disk.device.read.bytes_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -798,9 +783,15 @@ topology_template: disk.device.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.device.capacity_pd_server_1b + network.outgoing.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2 feature_server_1b_ps_2: - abstract_ps_server_1b - feature_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 feature_server_1b_ps_3: - abstract_ps_server_1b - feature_ps_server_1b @@ -824,7 +815,7 @@ topology_template: - disk.read.bytes_pd_server_1b network.incoming.packets.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 disk.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.iops_ps_server_1b @@ -834,15 +825,9 @@ topology_template: endpoint_server_1b_pd_2: - abstract_pd_server_1b - endpoint_pd_server_1b - network.incoming.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port network.incoming.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port - network.incoming.bytes_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 memory_server_1b_pd_2: - abstract_pd_server_1b - memory_pd_server_1b @@ -861,18 +846,36 @@ topology_template: disk.device.usage_server_1b_pd_3: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + binding_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port_2 + forwarder_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port_2 disk.device.latency_server_1b_pd_2: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.latency_server_1b_pd_3: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + binding_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_3: - abstract_pd_server_1b - scalable_pd_server_1b + feature_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_2: - abstract_pd_server_1b - scalable_pd_server_1b + network.incoming.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 cpu.delta_server_1b_pd_2: - abstract_pd_server_1b - cpu.delta_pd_server_1b @@ -882,15 +885,18 @@ topology_template: disk.device.read.requests_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b - network.incoming.packets_pd_server_1b_port_3: + feature_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 network.incoming.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 disk.device.read.requests_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + forwarder_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port_2 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -899,16 +905,10 @@ topology_template: - disk.device.read.bytes_ps_server_1b network.incoming.bytes.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port - network.incoming.bytes.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2 feature_ps_server_1b_port_2: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_3: - - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_2 requirements: dependency_template_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 @@ -922,9 +922,6 @@ topology_template: local_storage_server_1b_pd_2: - abstract_pd_server_1b - local_storage_pd_server_1b - dependency_pd_server_1b_port_3: - - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port dependency_server_1b_ps_2: - abstract_ps_server_1b - dependency_ps_server_1b @@ -933,16 +930,16 @@ topology_template: - dependency_ps_server_1b dependency_pd_server_1b_port_2: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_2 dependency_ps_server_1b_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency - dependency_ps_server_1b_port_3: + dependency_ps_server_1b_1_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_packet_int_network: - packet_int_network - dependency @@ -952,6 +949,9 @@ topology_template: dependency_test_resourceGroup_3: - test_resourceGroup_3 - dependency + dependency_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port_2 local_storage_server_1b_ps_2: - abstract_ps_server_1b - local_storage_ps_server_1b @@ -963,4 +963,4 @@ topology_template: - dependency_pd_server_1b dependency_server_1b_pd_3: - abstract_pd_server_1b - - dependency_pd_server_1b
\ No newline at end of file + - dependency_pd_server_1b |