From 7b492b5f191cd5c22e3c4254f5f3ef7476122e9d Mon Sep 17 00:00:00 2001 From: vempo Date: Sun, 5 Nov 2017 17:14:25 +0200 Subject: Port scaling not working properly Made changes in evaluating port naming pattern. Change-Id: If9a3fc9c3d50fa5c4da319d2ff7d5f8ce6ca8ffe Issue-ID: SDC-573 Signed-off-by: vempo --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 942 ++++++++++----------- .../out/MainServiceTemplate.yaml | 62 +- .../Nested_pd_server_main_1bServiceTemplate.yaml | 148 ++-- .../Nested_pd_server_main_1b_1ServiceTemplate.yaml | 148 ++-- ...Nested_pd_server_nested2_1bServiceTemplate.yaml | 178 ++-- .../Nested_ps_server_main_1bServiceTemplate.yaml | 158 ++-- .../Nested_ps_server_main_1b_1ServiceTemplate.yaml | 158 ++-- ...Nested_ps_server_nested2_1bServiceTemplate.yaml | 184 ++-- .../out/nested1ServiceTemplate.yaml | 114 +-- .../out/nested2ServiceTemplate.yaml | 88 +- 10 files changed, 1090 insertions(+), 1090 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index b41b4dece5..32fbdf01c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_nested2_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd_server_nested_b_port_vlan_requirements: + port_pd_server_nested2_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_nested_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_nested2_1b_port_order: + type: integer required: true status: SUPPORTED index_value: @@ -26,21 +26,31 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd_server_nested_b_port_fixed_ips: + port_pd_server_nested2_1b_port_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd_server_nested2_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_nested_b_port_network_role_tag: + port_pd_server_nested2_1b_port_network_role: type: string required: true status: SUPPORTED + port_pd_server_nested2_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_nested_b_port_subnetpoolid: + port_pd_server_nested2_1b_port_subnetpoolid: type: string required: true status: SUPPORTED @@ -56,54 +66,31 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_nested_b_port_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd_server_nested_b_port_network: + port_pd_server_nested2_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_nested_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_nested2_1b_port_network_role_tag: + type: string required: true status: SUPPORTED - port_pd_server_nested_b_port_replacement_policy: + port_pd_server_nested2_1b_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_nested_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_nested_b_port_ip_requirements: - type: list + port_pd_server_nested2_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_pd_server_nested2_1b_pd_server_nested_b_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_nested2_1b_pd_server_nested_b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_pd_server_nested2_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -118,32 +105,45 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pd_server_nested2_1b_pd_server_nested2_1b_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_nested2_1b_pd_server_nested2_1b_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: - cpu_pd_server_nested2_1b: + network.outpoing.packets_pd_server_nested2_1b_pd_server_nested2_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.ephemeral.size_pd_server_nested2_1b: + cpu_pd_server_nested2_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.packets.rate_pd_server_nested2_1b_pd_server_nested_b_port: + disk.ephemeral.size_pd_server_nested2_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_pd_server_nested2_1b: + network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_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_pd_server_nested2_1b_pd_server_nested_b_port: + memory.usage_pd_server_nested2_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: @@ -172,15 +172,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested_b_port: + disk.device.read.requests.rate_pd_server_nested2_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_nested2_1b: - 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_nested2_1b_pd_server_nested2_1b_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -207,7 +206,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_nested2_1b_pd_server_nested_b_port: + network.outgoing.packets.rate_pd_server_nested2_1b_pd_server_nested2_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: @@ -219,6 +218,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_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.iops_pd_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -260,17 +265,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_nested2_1b_pd_server_nested_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested_b_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.capacity_pd_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -283,18 +277,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_nested2_1b_pd_server_nested_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - attachment_pd_server_nested2_1b_pd_server_nested_b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED instance_pd_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -330,19 +312,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested_b_port: + cpu.delta_pd_server_nested2_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_nested2_1b: + binding_pd_server_nested2_1b_pd_server_nested2_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + vcpus_pd_server_nested2_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_pd_server_nested2_1b: + network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_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: @@ -366,19 +355,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested_b_port: + network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested2_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.allocation_pd_server_nested2_1b: + network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested2_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.outpoing.packets_pd_server_nested2_1b_pd_server_nested_b_port: + disk.allocation_pd_server_nested2_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: @@ -390,6 +379,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_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 + feature_pd_server_nested2_1b_pd_server_nested2_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_pd_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6830,11 +6830,19 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_main_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_main_b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_ip_requirements: + type: list required: true status: SUPPORTED - port_ps_server_main_b_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_main_1b_port_subnetpoolid: type: string required: true status: SUPPORTED @@ -6844,7 +6852,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_main_b_port_exCP_naming: + port_ps_server_main_1b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -6856,47 +6864,27 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_main_b_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_main_b_port_network: - type: list + port_ps_server_main_1b_port_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_order: + port_ps_server_main_1b_port_order: type: integer required: true status: SUPPORTED - port_ps_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_main_b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_main_b_port_vlan_requirements: + port_ps_server_main_1b_port_vlan_requirements: type: list required: true status: SUPPORTED @@ -6908,19 +6896,31 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_main_b_port_subnetpoolid: - type: string + port_ps_server_main_1b_port_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_main_1b_port_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_ps_server_main_1b_ps_server_main_b_port: + - dependency_ps_server_main_1b_ps_server_main_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_main_1b_ps_server_main_b_port: + - link_ps_server_main_1b_ps_server_main_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6941,6 +6941,12 @@ node_types: - 0 - UNBOUNDED capabilities: + network.incoming.bytes_ps_server_main_1b_ps_server_main_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.write.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6959,9 +6965,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_b_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_ps_server_main_1b_ps_server_main_1b_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -6977,7 +6982,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_main_1b_ps_server_main_b_port: + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_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: @@ -6989,6 +6994,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_main_1b_ps_server_main_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.write.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7019,6 +7031,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_main_1b_ps_server_main_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.read.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7031,6 +7049,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_main_1b_ps_server_main_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7054,6 +7077,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_main_1b_ps_server_main_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.rate_ps_server_main_1b_ps_server_main_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.usage_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7088,17 +7123,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_main_1b_ps_server_main_b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_ps_server_main_1b_ps_server_main_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7117,31 +7141,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_b_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_ps_server_main_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_b_port: + network.incoming.packets_ps_server_main_1b_ps_server_main_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 - binding_ps_server_main_1b: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_ps_server_main_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_main_1b_ps_server_main_b_port: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_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 @@ -7152,25 +7171,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_main_1b_ps_server_main_b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.iops_ps_server_main_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_ps_server_main_1b_ps_server_main_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.write.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7218,25 +7224,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_b_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_main_1b_ps_server_main_b_port: + memory_ps_server_main_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_ps_server_main_1b: + disk.root.size_ps_server_main_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.root.size_ps_server_main_1b: + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_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: @@ -9633,10 +9633,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd_server_main_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -9645,8 +9641,8 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd_server_main_b_port_order: - type: integer + port_pd_server_main_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_main_1b_availability_zone: @@ -9655,66 +9651,70 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_main_b_port_replacement_policy: + port_pd_server_main_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_main_b_port_subnetpoolid: + port_pd_server_main_1b_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_main_b_port_network_role_tag: - type: string + port_pd_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_main_b_port_fixed_ips: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_b_port_vlan_requirements: + port_pd_server_main_1b_port_network_role: + type: string + required: true + status: SUPPORTED + compute_pd_server_main_1b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_b_port_network_role: - type: string + type: string + port_pd_server_main_1b_port_network: + type: list required: true status: SUPPORTED - port_pd_server_main_b_port_ip_requirements: + entry_schema: + type: string + port_pd_server_main_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_pd_server_main_1b_port_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_pd_server_main_1b_name: + port_pd_server_main_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_b_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_main_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_order: + type: integer + required: true + status: SUPPORTED requirements: - dependency_pd_server_main_1b: capability: tosca.capabilities.Node @@ -9730,14 +9730,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_main_1b_pd_server_main_b_port: + - dependency_pd_server_main_1b_pd_server_main_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_main_1b_pd_server_main_b_port: + - link_pd_server_main_1b_pd_server_main_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -9790,19 +9790,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_b_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 endpoint_pd_server_main_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - attachment_pd_server_main_1b_pd_server_main_b_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_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 @@ -9812,6 +9807,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_main_1b_pd_server_main_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED host_pd_server_main_1b: type: tosca.capabilities.Container valid_source_types: @@ -9819,25 +9821,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_main_1b_pd_server_main_b_port: + cpu.delta_pd_server_main_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_main_1b: + network.incoming.packets_pd_server_main_1b_pd_server_main_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 - binding_pd_server_main_1b_pd_server_main_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.bytes_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9850,7 +9845,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_main_1b_pd_server_main_b_port: + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_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: @@ -9868,12 +9863,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_b_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.write.bytes_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9886,7 +9875,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_main_1b_pd_server_main_b_port: + feature_pd_server_main_1b_pd_server_main_1b_port: type: tosca.capabilities.Node occurrences: - 1 @@ -9908,43 +9897,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server_main_1b: + network.outgoing.bytes_pd_server_main_1b_pd_server_main_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.allocation_pd_server_main_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.usage_pd_server_main_1b: + disk.read.requests_pd_server_main_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.bytes.rate_pd_server_main_1b_pd_server_main_b_port: + disk.allocation_pd_server_main_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_main_1b: + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_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.bytes_pd_server_main_1b_pd_server_main_b_port: + disk.device.usage_pd_server_main_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.rate_pd_server_main_1b_pd_server_main_b_port: + disk.write.requests.rate_pd_server_main_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: @@ -9985,6 +9968,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_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.read.bytes.rate_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9997,18 +9986,23 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_pd_server_main_1b: + network.incoming.bytes_pd_server_main_1b_pd_server_main_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_pd_server_main_1b_pd_server_main_b_port: + disk.device.allocation_pd_server_main_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_pd_server_main_1b_pd_server_main_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.iops_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10027,6 +10021,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_main_1b_pd_server_main_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_util_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10054,10 +10054,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_main_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd_server_main_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -10066,8 +10062,8 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd_server_main_b_port_order: - type: integer + port_pd_server_main_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_main_1b_availability_zone: @@ -10076,66 +10072,70 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_main_b_port_replacement_policy: + port_pd_server_main_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_main_b_port_subnetpoolid: + port_pd_server_main_1b_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_main_b_port_network_role_tag: - type: string + port_pd_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_main_b_port_fixed_ips: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_b_port_vlan_requirements: + port_pd_server_main_1b_port_network_role: + type: string + required: true + status: SUPPORTED + compute_pd_server_main_1b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_b_port_network_role: - type: string + type: string + port_pd_server_main_1b_port_network: + type: list required: true status: SUPPORTED - port_pd_server_main_b_port_ip_requirements: + entry_schema: + type: string + port_pd_server_main_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_pd_server_main_1b_port_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_pd_server_main_1b_name: + port_pd_server_main_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_b_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_main_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_order: + type: integer + required: true + status: SUPPORTED requirements: - dependency_pd_server_main_1b: capability: tosca.capabilities.Node @@ -10151,14 +10151,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_main_1b_pd_server_main_b_port: + - dependency_pd_server_main_1b_pd_server_main_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_main_1b_pd_server_main_b_port: + - link_pd_server_main_1b_pd_server_main_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -10211,19 +10211,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_b_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 endpoint_pd_server_main_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - attachment_pd_server_main_1b_pd_server_main_b_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_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 @@ -10233,6 +10228,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_main_1b_pd_server_main_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED host_pd_server_main_1b: type: tosca.capabilities.Container valid_source_types: @@ -10240,25 +10242,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_main_1b_pd_server_main_b_port: + cpu.delta_pd_server_main_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_main_1b: + network.incoming.packets_pd_server_main_1b_pd_server_main_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 - binding_pd_server_main_1b_pd_server_main_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.bytes_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10271,7 +10266,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_main_1b_pd_server_main_b_port: + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_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: @@ -10289,12 +10284,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_b_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.write.bytes_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10307,7 +10296,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_main_1b_pd_server_main_b_port: + feature_pd_server_main_1b_pd_server_main_1b_port: type: tosca.capabilities.Node occurrences: - 1 @@ -10329,43 +10318,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server_main_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.allocation_pd_server_main_1b: + network.outgoing.bytes_pd_server_main_1b_pd_server_main_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.usage_pd_server_main_1b: + disk.read.requests_pd_server_main_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.bytes.rate_pd_server_main_1b_pd_server_main_b_port: + disk.allocation_pd_server_main_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_main_1b: + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_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.bytes_pd_server_main_1b_pd_server_main_b_port: + disk.device.usage_pd_server_main_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.rate_pd_server_main_1b_pd_server_main_b_port: + disk.write.requests.rate_pd_server_main_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: @@ -10406,6 +10389,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_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.read.bytes.rate_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10418,18 +10407,23 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_pd_server_main_1b: + network.incoming.bytes_pd_server_main_1b_pd_server_main_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_pd_server_main_1b_pd_server_main_b_port: + disk.device.allocation_pd_server_main_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_pd_server_main_1b_pd_server_main_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.iops_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10448,6 +10442,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_main_1b_pd_server_main_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_util_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10538,11 +10538,19 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_main_b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_fixed_ips: + type: list required: true status: SUPPORTED - port_ps_server_main_b_port_network_role: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_main_1b_port_subnetpoolid: type: string required: true status: SUPPORTED @@ -10552,7 +10560,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_main_b_port_exCP_naming: + port_ps_server_main_1b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -10564,47 +10572,27 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_main_b_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_main_b_port_network: - type: list + port_ps_server_main_1b_port_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_order: + port_ps_server_main_1b_port_order: type: integer required: true status: SUPPORTED - port_ps_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_main_b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_main_b_port_vlan_requirements: + port_ps_server_main_1b_port_vlan_requirements: type: list required: true status: SUPPORTED @@ -10616,19 +10604,31 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_main_b_port_subnetpoolid: - type: string + port_ps_server_main_1b_port_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_main_1b_port_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_ps_server_main_1b_ps_server_main_b_port: + - dependency_ps_server_main_1b_ps_server_main_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_main_1b_ps_server_main_b_port: + - link_ps_server_main_1b_ps_server_main_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -10649,6 +10649,12 @@ node_types: - 0 - UNBOUNDED capabilities: + network.incoming.bytes_ps_server_main_1b_ps_server_main_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.write.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10667,9 +10673,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_b_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_ps_server_main_1b_ps_server_main_1b_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -10685,7 +10690,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_main_1b_ps_server_main_b_port: + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_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: @@ -10697,6 +10702,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_main_1b_ps_server_main_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.write.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10727,6 +10739,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_main_1b_ps_server_main_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.read.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10739,6 +10757,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_main_1b_ps_server_main_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10762,6 +10785,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_main_1b_ps_server_main_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.rate_ps_server_main_1b_ps_server_main_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.usage_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10796,17 +10831,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_main_1b_ps_server_main_b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_ps_server_main_1b_ps_server_main_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10825,31 +10849,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_b_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_ps_server_main_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_b_port: + network.incoming.packets_ps_server_main_1b_ps_server_main_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 - binding_ps_server_main_1b: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_ps_server_main_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_main_1b_ps_server_main_b_port: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_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 @@ -10860,25 +10879,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_main_1b_ps_server_main_b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.iops_ps_server_main_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_ps_server_main_1b_ps_server_main_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.write.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10926,25 +10932,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_b_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_main_1b_ps_server_main_b_port: + memory_ps_server_main_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_ps_server_main_1b: + disk.root.size_ps_server_main_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.root.size_ps_server_main_1b: + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_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: @@ -11380,24 +11380,20 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_nested_b_port_replacement_policy: - type: list + port_ps_server_nested2_1b_port_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps_server_nested_b_port_ip_requirements: + port_ps_server_nested2_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_nested_b_port_network: - type: list + port_ps_server_nested2_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -11412,11 +11408,13 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_nested_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + compute_ps_server_nested2_1b_availability_zone: + type: list required: true status: SUPPORTED - compute_ps_server_nested2_1b_availability_zone: + entry_schema: + type: string + port_ps_server_nested2_1b_port_replacement_policy: type: list required: true status: SUPPORTED @@ -11426,56 +11424,45 @@ node_types: type: string required: true status: SUPPORTED - port_ps_server_nested_b_port_fixed_ips: + port_ps_server_nested2_1b_port_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_nested_b_port_subnetpoolid: - type: string + type: string + port_ps_server_nested2_1b_port_vlan_requirements: + type: list required: true status: SUPPORTED - port_ps_server_nested_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_nested2_1b_port_network_role: + type: string required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_nested_b_port_vlan_requirements: - type: list + port_ps_server_nested2_1b_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_nested_b_port_network_role: + port_ps_server_nested2_1b_port_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_nested_b_port_network_role_tag: - type: string + port_ps_server_nested2_1b_port_fixed_ips: + type: list required: true status: SUPPORTED - port_ps_server_nested_b_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_nested2_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED requirements: - - dependency_ps_server_nested2_1b_ps_server_nested_b_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_ps_server_nested2_1b_ps_server_nested_b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_ps_server_nested2_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -11490,44 +11477,39 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - disk.device.read.bytes.rate_ps_server_nested2_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - dependency_ps_server_nested2_1b_ps_server_nested2_1b_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested_b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - link_ps_server_nested2_1b_ps_server_nested2_1b_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED - disk.iops_ps_server_nested2_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_nested2_1b: + capabilities: + disk.device.read.bytes.rate_ps_server_nested2_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.packets.rate_ps_server_nested2_1b_ps_server_nested_b_port: + disk.iops_ps_server_nested2_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 - instance_ps_server_nested2_1b: + vcpus_ps_server_nested2_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_ps_server_nested2_1b_ps_server_nested_b_port: + instance_ps_server_nested2_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: @@ -11557,25 +11539,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_ps_server_nested2_1b: + network.incoming.packets_ps_server_nested2_1b_ps_server_nested2_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_ps_server_nested2_1b: + disk.device.allocation_ps_server_nested2_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.resident_ps_server_nested2_1b: + cpu.delta_ps_server_nested2_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.outpoing.packets_ps_server_nested2_1b_ps_server_nested_b_port: + memory.resident_ps_server_nested2_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: @@ -11618,6 +11600,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_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 scalable_ps_server_nested2_1b: type: tosca.capabilities.Scalable occurrences: @@ -11629,13 +11617,31 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_nested2_1b_ps_server_nested2_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.packets.rate_ps_server_nested2_1b_ps_server_nested2_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.outpoing.packets_ps_server_nested2_1b_ps_server_nested2_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_util_ps_server_nested2_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_ps_server_nested2_1b_ps_server_nested_b_port: + network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested2_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: @@ -11647,24 +11653,23 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_ps_server_nested2_1b: + network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested2_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_ps_server_nested2_1b: + disk.write.requests_ps_server_nested2_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_ps_server_nested2_1b_ps_server_nested_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + memory_ps_server_nested2_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: - - 0 + - 1 - UNBOUNDED disk.device.read.requests.rate_ps_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -11678,12 +11683,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_nested2_1b_ps_server_nested_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested_b_port: + network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_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: @@ -11695,6 +11695,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_nested2_1b_ps_server_nested2_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_ps_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11734,12 +11739,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested_b_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.write.requests_ps_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11752,11 +11751,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_nested2_1b_ps_server_nested_b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server_nested2_1b: type: tosca.capabilities.OperatingSystem occurrences: @@ -11780,19 +11774,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests_ps_server_nested2_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_nested2_1b_ps_server_nested2_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_ps_server_nested2_1b_ps_server_nested2_1b_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_nested2_1b: + disk.device.read.requests_ps_server_nested2_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.rate_ps_server_nested2_1b_ps_server_nested_b_port: + disk.device.write.bytes.rate_ps_server_nested2_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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index ed4dbd6cb2..3e27a96590 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -105,32 +105,32 @@ topology_template: properties: compute_pd_server_main_1b_availability_zone: - get_input: availability_zone_0 - port_pd_server_main_b_port_replacement_policy: + port_pd_server_main_1b_port_replacement_policy: - AUTO + port_pd_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pd_server_main_1b_flavor - port_pd_server_main_b_port_fixed_ips: - - ip_address: - get_input: - - pd_server_main_1b_ips - - 0 - port_pd_server_main_b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_server_main_1b_image - port_pd_server_main_b_port_mac_requirements: - mac_count_required: - is_required: false compute_pd_server_main_1b_name: - get_input: - pd_server_main_1b_names - 0 - port_pd_server_main_b_port_network: + port_pd_server_main_1b_port_network: - get_input: jsa_name + port_pd_server_main_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pd_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_main_1b_ips + - 0 service_template_filter: substitute_service_template: Nested_pd_server_main_1b_1ServiceTemplate.yaml count: 1 @@ -144,34 +144,34 @@ topology_template: directives: - substitutable properties: - compute_ps_server_main_1b_availability_zone: - - get_input: availability_zone_0 - port_ps_server_main_b_port_replacement_policy: - - AUTO - port_ps_server_main_b_port_ip_requirements: + port_ps_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_main_1b_ips + - 0 + port_ps_server_main_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_ps_server_main_1b_availability_zone: + - get_input: availability_zone_0 vm_flavor_name: get_input: ps_server_main_1b_flavor - port_ps_server_main_b_port_network: - - get_input: jsa_name - port_ps_server_main_b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_main_b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_main_1b_ips - - 0 vm_image_name: get_input: ps_server_main_1b_image compute_ps_server_main_1b_name: - get_input: - ps_server_main_1b_names - 1 + port_ps_server_main_1b_port_replacement_policy: + - AUTO + port_ps_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_main_1b_port_network: + - get_input: jsa_name service_template_filter: substitute_service_template: Nested_ps_server_main_1b_1ServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index 697a9a1f1a..b489bc4c05 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd_server_main_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -21,62 +18,65 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_server_main_b_port_order: - type: integer + port_pd_server_main_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_main_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_main_b_port_replacement_policy: + port_pd_server_main_1b_port_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_main_b_port_subnetpoolid: + port_pd_server_main_1b_port_subnetpoolid: type: string required: true - port_pd_server_main_b_port_network_role_tag: - type: string + port_pd_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_flavor_name: type: string required: true - port_pd_server_main_b_port_fixed_ips: + vm_image_name: + type: string + required: true + port_pd_server_main_1b_port_network_role: + type: string + required: true + compute_pd_server_main_1b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_b_port_vlan_requirements: + type: string + port_pd_server_main_1b_port_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_b_port_network_role: - type: string - required: true - port_pd_server_main_b_port_ip_requirements: + type: string + port_pd_server_main_1b_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_pd_server_main_1b_port_network_role_tag: type: string required: true - port_pd_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_pd_server_main_1b_name: + port_pd_server_main_1b_port_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd_server_main_b_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_main_1b_port_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_order: + type: integer + required: true node_templates: pd_server_main_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b @@ -93,34 +93,34 @@ topology_template: get_input: - compute_pd_server_main_1b_name - index_value - pd_server_main_1b_pd_server_main_b_port: + pd_server_main_1b_pd_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_server_main_b_port_exCP_naming + get_input: port_pd_server_main_1b_port_exCP_naming replacement_policy: get_input: - - port_pd_server_main_b_port_replacement_policy + - port_pd_server_main_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_pd_server_main_b_port_vlan_requirements + get_input: port_pd_server_main_1b_port_vlan_requirements ip_requirements: - get_input: port_pd_server_main_b_port_ip_requirements + get_input: port_pd_server_main_1b_port_ip_requirements network_role_tag: - get_input: port_pd_server_main_b_port_network_role_tag + get_input: port_pd_server_main_1b_port_network_role_tag mac_requirements: - get_input: port_pd_server_main_b_port_mac_requirements + get_input: port_pd_server_main_1b_port_mac_requirements order: - get_input: port_pd_server_main_b_port_order + get_input: port_pd_server_main_1b_port_order network_role: - get_input: port_pd_server_main_b_port_network_role + get_input: port_pd_server_main_1b_port_network_role subnetpoolid: - get_input: port_pd_server_main_b_port_subnetpoolid + get_input: port_pd_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_main_b_port_fixed_ips + get_input: port_pd_server_main_1b_port_fixed_ips network: get_input: - - port_pd_server_main_b_port_network + - port_pd_server_main_1b_port_network - index_value requirements: - binding: @@ -154,56 +154,50 @@ topology_template: scalable_pd_server_main_1b: - pd_server_main_1b - scalable - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.packets.rate endpoint_pd_server_main_1b: - pd_server_main_1b - endpoint - attachment_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - attachment + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.packets.rate instance_pd_server_main_1b: - pd_server_main_1b - instance + binding_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - binding host_pd_server_main_1b: - pd_server_main_1b - host - network.outpoing.packets_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outpoing.packets cpu.delta_pd_server_main_1b: - pd_server_main_1b - cpu.delta - binding_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - binding + network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.packets disk.device.read.bytes_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes disk.device.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outgoing.bytes + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.packets.rate disk.device.iops_pd_server_main_1b: - pd_server_main_1b - disk.device.iops disk.device.write.requests.rate_pd_server_main_1b: - pd_server_main_1b - disk.device.write.requests.rate - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outgoing.packets.rate disk.device.write.bytes_pd_server_main_1b: - pd_server_main_1b - disk.device.write.bytes disk.device.latency_pd_server_main_1b: - pd_server_main_1b - disk.device.latency - feature_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port + feature_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port - feature binding_pd_server_main_1b: - pd_server_main_1b @@ -214,27 +208,24 @@ topology_template: disk.ephemeral.size_pd_server_main_1b: - pd_server_main_1b - disk.ephemeral.size + network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes disk.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.read.requests disk.allocation_pd_server_main_1b: - pd_server_main_1b - disk.allocation + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.bytes.rate disk.device.usage_pd_server_main_1b: - pd_server_main_1b - disk.device.usage - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.bytes.rate disk.write.requests.rate_pd_server_main_1b: - pd_server_main_1b - disk.write.requests.rate - network.incoming.bytes_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outgoing.bytes.rate os_pd_server_main_1b: - pd_server_main_1b - os @@ -253,18 +244,24 @@ topology_template: disk.latency_pd_server_main_1b: - pd_server_main_1b - disk.latency + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes.rate disk.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.read.bytes.rate disk.device.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.device.read.requests + network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.bytes disk.device.allocation_pd_server_main_1b: - pd_server_main_1b - disk.device.allocation - network.incoming.packets_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.packets + attachment_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - attachment disk.iops_pd_server_main_1b: - pd_server_main_1b - disk.iops @@ -274,6 +271,9 @@ topology_template: disk.write.requests_pd_server_main_1b: - pd_server_main_1b - disk.write.requests + network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outpoing.packets cpu_util_pd_server_main_1b: - pd_server_main_1b - cpu_util @@ -287,15 +287,15 @@ topology_template: - pd_server_main_1b - disk.device.read.requests.rate requirements: - link_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port + link_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port - link - dependency_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - dependency dependency_pd_server_main_1b: - pd_server_main_1b - dependency local_storage_pd_server_main_1b: - pd_server_main_1b - local_storage + dependency_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index 164b9eee61..c1f087a7f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd_server_main_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -21,62 +18,65 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_server_main_b_port_order: - type: integer + port_pd_server_main_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_main_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_main_b_port_replacement_policy: + port_pd_server_main_1b_port_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_main_b_port_subnetpoolid: + port_pd_server_main_1b_port_subnetpoolid: type: string required: true - port_pd_server_main_b_port_network_role_tag: - type: string + port_pd_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_flavor_name: type: string required: true - port_pd_server_main_b_port_fixed_ips: + vm_image_name: + type: string + required: true + port_pd_server_main_1b_port_network_role: + type: string + required: true + compute_pd_server_main_1b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_b_port_vlan_requirements: + type: string + port_pd_server_main_1b_port_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_b_port_network_role: - type: string - required: true - port_pd_server_main_b_port_ip_requirements: + type: string + port_pd_server_main_1b_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + port_pd_server_main_1b_port_network_role_tag: type: string required: true - port_pd_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_pd_server_main_1b_name: + port_pd_server_main_1b_port_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd_server_main_b_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_main_1b_port_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_order: + type: integer + required: true node_templates: pd_server_main_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b @@ -93,34 +93,34 @@ topology_template: get_input: - compute_pd_server_main_1b_name - index_value - pd_server_main_1b_pd_server_main_b_port: + pd_server_main_1b_pd_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_server_main_b_port_exCP_naming + get_input: port_pd_server_main_1b_port_exCP_naming replacement_policy: get_input: - - port_pd_server_main_b_port_replacement_policy + - port_pd_server_main_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_pd_server_main_b_port_vlan_requirements + get_input: port_pd_server_main_1b_port_vlan_requirements ip_requirements: - get_input: port_pd_server_main_b_port_ip_requirements + get_input: port_pd_server_main_1b_port_ip_requirements network_role_tag: - get_input: port_pd_server_main_b_port_network_role_tag + get_input: port_pd_server_main_1b_port_network_role_tag mac_requirements: - get_input: port_pd_server_main_b_port_mac_requirements + get_input: port_pd_server_main_1b_port_mac_requirements order: - get_input: port_pd_server_main_b_port_order + get_input: port_pd_server_main_1b_port_order network_role: - get_input: port_pd_server_main_b_port_network_role + get_input: port_pd_server_main_1b_port_network_role subnetpoolid: - get_input: port_pd_server_main_b_port_subnetpoolid + get_input: port_pd_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_main_b_port_fixed_ips + get_input: port_pd_server_main_1b_port_fixed_ips network: get_input: - - port_pd_server_main_b_port_network + - port_pd_server_main_1b_port_network - index_value requirements: - binding: @@ -154,56 +154,50 @@ topology_template: scalable_pd_server_main_1b: - pd_server_main_1b - scalable - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.packets.rate endpoint_pd_server_main_1b: - pd_server_main_1b - endpoint - attachment_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - attachment + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.packets.rate instance_pd_server_main_1b: - pd_server_main_1b - instance + binding_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - binding host_pd_server_main_1b: - pd_server_main_1b - host - network.outpoing.packets_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outpoing.packets cpu.delta_pd_server_main_1b: - pd_server_main_1b - cpu.delta - binding_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - binding + network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.packets disk.device.read.bytes_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes disk.device.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outgoing.bytes + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.packets.rate disk.device.iops_pd_server_main_1b: - pd_server_main_1b - disk.device.iops disk.device.write.requests.rate_pd_server_main_1b: - pd_server_main_1b - disk.device.write.requests.rate - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outgoing.packets.rate disk.device.write.bytes_pd_server_main_1b: - pd_server_main_1b - disk.device.write.bytes disk.device.latency_pd_server_main_1b: - pd_server_main_1b - disk.device.latency - feature_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port + feature_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port - feature binding_pd_server_main_1b: - pd_server_main_1b @@ -214,27 +208,24 @@ topology_template: disk.ephemeral.size_pd_server_main_1b: - pd_server_main_1b - disk.ephemeral.size + network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes disk.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.read.requests disk.allocation_pd_server_main_1b: - pd_server_main_1b - disk.allocation + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.bytes.rate disk.device.usage_pd_server_main_1b: - pd_server_main_1b - disk.device.usage - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.bytes.rate disk.write.requests.rate_pd_server_main_1b: - pd_server_main_1b - disk.write.requests.rate - network.incoming.bytes_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.outgoing.bytes.rate os_pd_server_main_1b: - pd_server_main_1b - os @@ -253,18 +244,24 @@ topology_template: disk.latency_pd_server_main_1b: - pd_server_main_1b - disk.latency + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes.rate disk.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.read.bytes.rate disk.device.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.device.read.requests + network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.incoming.bytes disk.device.allocation_pd_server_main_1b: - pd_server_main_1b - disk.device.allocation - network.incoming.packets_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - network.incoming.packets + attachment_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - attachment disk.iops_pd_server_main_1b: - pd_server_main_1b - disk.iops @@ -274,6 +271,9 @@ topology_template: disk.write.requests_pd_server_main_1b: - pd_server_main_1b - disk.write.requests + network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - network.outpoing.packets cpu_util_pd_server_main_1b: - pd_server_main_1b - cpu_util @@ -287,15 +287,15 @@ topology_template: - pd_server_main_1b - disk.device.read.requests.rate requirements: - link_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port + link_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port - link - dependency_pd_server_main_1b_pd_server_main_b_port: - - pd_server_main_1b_pd_server_main_b_port - - dependency dependency_pd_server_main_1b: - pd_server_main_1b - dependency local_storage_pd_server_main_1b: - pd_server_main_1b - local_storage + dependency_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 13bd976915..2c205ebc52 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -11,13 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd_server_nested_b_port_vlan_requirements: + port_pd_server_nested2_1b_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_nested_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_nested2_1b_port_order: + type: integer required: true index_value: type: integer @@ -26,18 +26,26 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_server_nested_b_port_fixed_ips: + port_pd_server_nested2_1b_port_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_pd_server_nested2_1b_port_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_nested_b_port_network_role_tag: + port_pd_server_nested2_1b_port_network_role: type: string required: true + port_pd_server_nested2_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_flavor_name: type: string required: true - port_pd_server_nested_b_port_subnetpoolid: + port_pd_server_nested2_1b_port_subnetpoolid: type: string required: true compute_pd_server_nested2_1b_availability_zone: @@ -50,101 +58,93 @@ topology_template: required: true entry_schema: type: string - port_pd_server_nested_b_port_order: - type: integer + vm_image_name: + type: string required: true - port_pd_server_nested_b_port_network: + port_pd_server_nested2_1b_port_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_server_nested_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_nested2_1b_port_network_role_tag: + type: string required: true - port_pd_server_nested_b_port_replacement_policy: + port_pd_server_nested2_1b_port_network: type: list required: true entry_schema: type: string - vm_image_name: - type: string - required: true - port_pd_server_nested_b_port_network_role: - type: string - required: true - port_pd_server_nested_b_port_ip_requirements: - type: list + port_pd_server_nested2_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements node_templates: - pd_server_nested2_1b_pd_server_nested_b_port: + pd_server_nested2_1b: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_nested2_1b + properties: + availability_zone: + get_input: + - compute_pd_server_nested2_1b_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_nested2_1b_name + - index_value + pd_server_nested2_1b_pd_server_nested2_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_server_nested_b_port_exCP_naming + get_input: port_pd_server_nested2_1b_port_exCP_naming replacement_policy: get_input: - - port_pd_server_nested_b_port_replacement_policy + - port_pd_server_nested2_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_pd_server_nested_b_port_vlan_requirements + get_input: port_pd_server_nested2_1b_port_vlan_requirements ip_requirements: - get_input: port_pd_server_nested_b_port_ip_requirements + get_input: port_pd_server_nested2_1b_port_ip_requirements network_role_tag: - get_input: port_pd_server_nested_b_port_network_role_tag + get_input: port_pd_server_nested2_1b_port_network_role_tag mac_requirements: - get_input: port_pd_server_nested_b_port_mac_requirements + get_input: port_pd_server_nested2_1b_port_mac_requirements order: - get_input: port_pd_server_nested_b_port_order + get_input: port_pd_server_nested2_1b_port_order network_role: - get_input: port_pd_server_nested_b_port_network_role + get_input: port_pd_server_nested2_1b_port_network_role subnetpoolid: - get_input: port_pd_server_nested_b_port_subnetpoolid + get_input: port_pd_server_nested2_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_nested_b_port_fixed_ips + get_input: port_pd_server_nested2_1b_port_fixed_ips network: get_input: - - port_pd_server_nested_b_port_network + - port_pd_server_nested2_1b_port_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_nested2_1b relationship: tosca.relationships.network.BindsTo - pd_server_nested2_1b: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_nested2_1b - properties: - availability_zone: - get_input: - - compute_pd_server_nested2_1b_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_nested2_1b_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_nested2_1b capabilities: + network.outpoing.packets_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.outpoing.packets cpu_pd_server_nested2_1b: - pd_server_nested2_1b - cpu disk.ephemeral.size_pd_server_nested2_1b: - pd_server_nested2_1b - disk.ephemeral.size - network.outgoing.packets.rate_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.outgoing.packets.rate + network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.incoming.packets memory.usage_pd_server_nested2_1b: - pd_server_nested2_1b - memory.usage - network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.outgoing.bytes.rate disk.write.bytes.rate_pd_server_nested2_1b: - pd_server_nested2_1b - disk.write.bytes.rate @@ -157,12 +157,12 @@ topology_template: endpoint_pd_server_nested2_1b: - pd_server_nested2_1b - endpoint - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.incoming.packets.rate disk.device.read.requests.rate_pd_server_nested2_1b: - pd_server_nested2_1b - disk.device.read.requests.rate + attachment_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - attachment binding_pd_server_nested2_1b: - pd_server_nested2_1b - binding @@ -175,12 +175,15 @@ topology_template: disk.device.latency_pd_server_nested2_1b: - pd_server_nested2_1b - disk.device.latency - network.incoming.packets_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.incoming.packets + network.outgoing.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server_nested2_1b: - pd_server_nested2_1b - disk.device.write.bytes.rate + network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.outgoing.bytes disk.iops_pd_server_nested2_1b: - pd_server_nested2_1b - disk.iops @@ -202,24 +205,12 @@ topology_template: disk.device.read.requests_pd_server_nested2_1b: - pd_server_nested2_1b - disk.device.read.requests - feature_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - feature - network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.incoming.bytes.rate disk.capacity_pd_server_nested2_1b: - pd_server_nested2_1b - disk.capacity disk.write.bytes_pd_server_nested2_1b: - pd_server_nested2_1b - disk.write.bytes - binding_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - binding - attachment_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - attachment instance_pd_server_nested2_1b: - pd_server_nested2_1b - instance @@ -238,15 +229,18 @@ topology_template: disk.read.bytes_pd_server_nested2_1b: - pd_server_nested2_1b - disk.read.bytes - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.outgoing.bytes cpu.delta_pd_server_nested2_1b: - pd_server_nested2_1b - cpu.delta + binding_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - binding vcpus_pd_server_nested2_1b: - pd_server_nested2_1b - vcpus + network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.incoming.bytes disk.latency_pd_server_nested2_1b: - pd_server_nested2_1b - disk.latency @@ -256,18 +250,24 @@ topology_template: cpu_util_pd_server_nested2_1b: - pd_server_nested2_1b - cpu_util - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.outgoing.bytes.rate + network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.incoming.bytes.rate disk.allocation_pd_server_nested2_1b: - pd_server_nested2_1b - disk.allocation - network.outpoing.packets_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - network.outpoing.packets disk.device.write.requests.rate_pd_server_nested2_1b: - pd_server_nested2_1b - disk.device.write.requests.rate + network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - network.incoming.packets.rate + feature_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - feature memory.resident_pd_server_nested2_1b: - pd_server_nested2_1b - memory.resident @@ -287,15 +287,15 @@ topology_template: - pd_server_nested2_1b - host requirements: - dependency_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - dependency local_storage_pd_server_nested2_1b: - pd_server_nested2_1b - local_storage - link_pd_server_nested2_1b_pd_server_nested_b_port: - - pd_server_nested2_1b_pd_server_nested_b_port - - link dependency_pd_server_nested2_1b: - pd_server_nested2_1b - dependency + dependency_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - dependency + link_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index b6af3a68ed..c4c0dccb77 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -11,10 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_main_b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_ip_requirements: + type: list required: true - port_ps_server_main_b_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_main_1b_port_subnetpoolid: type: string required: true compute_ps_server_main_1b_availability_zone: @@ -22,7 +29,7 @@ topology_template: required: true entry_schema: type: string - port_ps_server_main_b_port_exCP_naming: + port_ps_server_main_1b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true index_value: @@ -32,39 +39,22 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_main_b_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_ps_server_main_b_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_main_b_port_network: - type: list + port_ps_server_main_1b_port_network_role: + type: string required: true - entry_schema: - type: string - port_ps_server_main_b_port_order: + port_ps_server_main_1b_port_order: type: integer required: true - port_ps_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps_server_main_b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_ps_server_main_b_port_vlan_requirements: + port_ps_server_main_1b_port_vlan_requirements: type: list required: true entry_schema: @@ -74,38 +64,48 @@ topology_template: required: true entry_schema: type: string - port_ps_server_main_b_port_subnetpoolid: - type: string + port_ps_server_main_1b_port_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_ps_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_main_1b_port_network: + type: list required: true + entry_schema: + type: string node_templates: - ps_server_main_1b_ps_server_main_b_port: + ps_server_main_1b_ps_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps_server_main_b_port_exCP_naming + get_input: port_ps_server_main_1b_port_exCP_naming replacement_policy: get_input: - - port_ps_server_main_b_port_replacement_policy + - port_ps_server_main_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_ps_server_main_b_port_vlan_requirements + get_input: port_ps_server_main_1b_port_vlan_requirements ip_requirements: - get_input: port_ps_server_main_b_port_ip_requirements + get_input: port_ps_server_main_1b_port_ip_requirements network_role_tag: - get_input: port_ps_server_main_b_port_network_role_tag + get_input: port_ps_server_main_1b_port_network_role_tag mac_requirements: - get_input: port_ps_server_main_b_port_mac_requirements + get_input: port_ps_server_main_1b_port_mac_requirements order: - get_input: port_ps_server_main_b_port_order + get_input: port_ps_server_main_1b_port_order network_role: - get_input: port_ps_server_main_b_port_network_role + get_input: port_ps_server_main_1b_port_network_role subnetpoolid: - get_input: port_ps_server_main_b_port_subnetpoolid + get_input: port_ps_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_main_b_port_fixed_ips + get_input: port_ps_server_main_1b_port_fixed_ips network: get_input: - - port_ps_server_main_b_port_network + - port_ps_server_main_1b_port_network - index_value requirements: - binding: @@ -130,6 +130,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_main_1b capabilities: + network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes disk.device.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests @@ -139,21 +142,24 @@ topology_template: disk.capacity_ps_server_main_1b: - ps_server_main_1b - disk.capacity - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.packets.rate + attachment_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - attachment disk.device.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes vcpus_ps_server_main_1b: - ps_server_main_1b - vcpus - network.incoming.bytes_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.bytes + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.packets.rate cpu_util_ps_server_main_1b: - ps_server_main_1b - cpu_util + binding_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - binding disk.device.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.bytes.rate @@ -169,12 +175,18 @@ topology_template: instance_ps_server_main_1b: - ps_server_main_1b - instance + network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outpoing.packets disk.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes.rate disk.latency_ps_server_main_1b: - ps_server_main_1b - disk.latency + feature_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - feature disk.device.read.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests @@ -187,6 +199,12 @@ topology_template: scalable_ps_server_main_1b: - ps_server_main_1b - scalable + network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes + network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.packets.rate disk.usage_ps_server_main_1b: - ps_server_main_1b - disk.usage @@ -205,12 +223,6 @@ topology_template: disk.write.bytes_ps_server_main_1b: - ps_server_main_1b - disk.write.bytes - network.incoming.packets_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.packets - feature_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - feature disk.device.write.bytes_ps_server_main_1b: - ps_server_main_1b - disk.device.write.bytes @@ -220,33 +232,24 @@ topology_template: disk.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.bytes.rate - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outgoing.bytes.rate - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.bytes.rate binding_ps_server_main_1b: - ps_server_main_1b - binding + network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.packets disk.device.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes.rate - attachment_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - attachment + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes.rate host_ps_server_main_1b: - ps_server_main_1b - host - network.outpoing.packets_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outpoing.packets disk.device.iops_ps_server_main_1b: - ps_server_main_1b - disk.device.iops - binding_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - binding disk.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.write.requests @@ -271,18 +274,15 @@ topology_template: disk.device.usage_ps_server_main_1b: - ps_server_main_1b - disk.device.usage - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outgoing.packets.rate - network.outgoing.bytes_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outgoing.bytes memory_ps_server_main_1b: - ps_server_main_1b - memory disk.root.size_ps_server_main_1b: - ps_server_main_1b - disk.root.size + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes.rate disk.allocation_ps_server_main_1b: - ps_server_main_1b - disk.allocation @@ -290,12 +290,12 @@ topology_template: dependency_ps_server_main_1b: - ps_server_main_1b - dependency - dependency_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port + link_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - link + dependency_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - local_storage - link_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index e37760f13e..2aac373139 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -11,10 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_main_b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_ip_requirements: + type: list required: true - port_ps_server_main_b_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_main_1b_port_subnetpoolid: type: string required: true compute_ps_server_main_1b_availability_zone: @@ -22,7 +29,7 @@ topology_template: required: true entry_schema: type: string - port_ps_server_main_b_port_exCP_naming: + port_ps_server_main_1b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true index_value: @@ -32,39 +39,22 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_main_b_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_ps_server_main_b_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_main_b_port_network: - type: list + port_ps_server_main_1b_port_network_role: + type: string required: true - entry_schema: - type: string - port_ps_server_main_b_port_order: + port_ps_server_main_1b_port_order: type: integer required: true - port_ps_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps_server_main_b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_ps_server_main_b_port_vlan_requirements: + port_ps_server_main_1b_port_vlan_requirements: type: list required: true entry_schema: @@ -74,38 +64,48 @@ topology_template: required: true entry_schema: type: string - port_ps_server_main_b_port_subnetpoolid: - type: string + port_ps_server_main_1b_port_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_ps_server_main_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_main_1b_port_network: + type: list required: true + entry_schema: + type: string node_templates: - ps_server_main_1b_ps_server_main_b_port: + ps_server_main_1b_ps_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps_server_main_b_port_exCP_naming + get_input: port_ps_server_main_1b_port_exCP_naming replacement_policy: get_input: - - port_ps_server_main_b_port_replacement_policy + - port_ps_server_main_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_ps_server_main_b_port_vlan_requirements + get_input: port_ps_server_main_1b_port_vlan_requirements ip_requirements: - get_input: port_ps_server_main_b_port_ip_requirements + get_input: port_ps_server_main_1b_port_ip_requirements network_role_tag: - get_input: port_ps_server_main_b_port_network_role_tag + get_input: port_ps_server_main_1b_port_network_role_tag mac_requirements: - get_input: port_ps_server_main_b_port_mac_requirements + get_input: port_ps_server_main_1b_port_mac_requirements order: - get_input: port_ps_server_main_b_port_order + get_input: port_ps_server_main_1b_port_order network_role: - get_input: port_ps_server_main_b_port_network_role + get_input: port_ps_server_main_1b_port_network_role subnetpoolid: - get_input: port_ps_server_main_b_port_subnetpoolid + get_input: port_ps_server_main_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_main_b_port_fixed_ips + get_input: port_ps_server_main_1b_port_fixed_ips network: get_input: - - port_ps_server_main_b_port_network + - port_ps_server_main_1b_port_network - index_value requirements: - binding: @@ -130,6 +130,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_main_1b_1 capabilities: + network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes disk.device.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests @@ -139,21 +142,24 @@ topology_template: disk.capacity_ps_server_main_1b: - ps_server_main_1b - disk.capacity - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.packets.rate + attachment_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - attachment disk.device.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes vcpus_ps_server_main_1b: - ps_server_main_1b - vcpus - network.incoming.bytes_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.bytes + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.packets.rate cpu_util_ps_server_main_1b: - ps_server_main_1b - cpu_util + binding_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - binding disk.device.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.bytes.rate @@ -169,12 +175,18 @@ topology_template: instance_ps_server_main_1b: - ps_server_main_1b - instance + network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outpoing.packets disk.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes.rate disk.latency_ps_server_main_1b: - ps_server_main_1b - disk.latency + feature_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - feature disk.device.read.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests @@ -187,6 +199,12 @@ topology_template: scalable_ps_server_main_1b: - ps_server_main_1b - scalable + network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes + network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.packets.rate disk.usage_ps_server_main_1b: - ps_server_main_1b - disk.usage @@ -205,12 +223,6 @@ topology_template: disk.write.bytes_ps_server_main_1b: - ps_server_main_1b - disk.write.bytes - network.incoming.packets_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.packets - feature_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - feature disk.device.write.bytes_ps_server_main_1b: - ps_server_main_1b - disk.device.write.bytes @@ -220,33 +232,24 @@ topology_template: disk.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.bytes.rate - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outgoing.bytes.rate - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.incoming.bytes.rate binding_ps_server_main_1b: - ps_server_main_1b - binding + network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.packets disk.device.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes.rate - attachment_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - attachment + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes.rate host_ps_server_main_1b: - ps_server_main_1b - host - network.outpoing.packets_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outpoing.packets disk.device.iops_ps_server_main_1b: - ps_server_main_1b - disk.device.iops - binding_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - binding disk.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.write.requests @@ -271,18 +274,15 @@ topology_template: disk.device.usage_ps_server_main_1b: - ps_server_main_1b - disk.device.usage - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outgoing.packets.rate - network.outgoing.bytes_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - network.outgoing.bytes memory_ps_server_main_1b: - ps_server_main_1b - memory disk.root.size_ps_server_main_1b: - ps_server_main_1b - disk.root.size + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes.rate disk.allocation_ps_server_main_1b: - ps_server_main_1b - disk.allocation @@ -290,12 +290,12 @@ topology_template: dependency_ps_server_main_1b: - ps_server_main_1b - dependency - dependency_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port + link_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - link + dependency_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - local_storage - link_ps_server_main_1b_ps_server_main_b_port: - - ps_server_main_1b_ps_server_main_b_port - - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index c39aa2dc26..b8fe67e9ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -11,21 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_nested_b_port_replacement_policy: - type: list + port_ps_server_nested2_1b_port_network_role_tag: + type: string required: true - entry_schema: - type: string - port_ps_server_nested_b_port_ip_requirements: + port_ps_server_nested2_1b_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_nested_b_port_network: - type: list + port_ps_server_nested2_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -38,119 +34,114 @@ topology_template: required: true entry_schema: type: string - port_ps_server_nested_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_ps_server_nested2_1b_availability_zone: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string - required: true - port_ps_server_nested_b_port_fixed_ips: + port_ps_server_nested2_1b_port_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_nested_b_port_subnetpoolid: + type: string + vm_flavor_name: type: string required: true - port_ps_server_nested_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_ps_server_nested2_1b_port_network: + type: list required: true - port_ps_server_nested_b_port_vlan_requirements: + entry_schema: + type: string + port_ps_server_nested2_1b_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_nested_b_port_network_role: + port_ps_server_nested2_1b_port_network_role: type: string required: true - port_ps_server_nested_b_port_network_role_tag: + vm_image_name: type: string required: true - port_ps_server_nested_b_port_order: + port_ps_server_nested2_1b_port_order: type: integer required: true + port_ps_server_nested2_1b_port_subnetpoolid: + type: string + required: true + port_ps_server_nested2_1b_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_nested2_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: - ps_server_nested2_1b_ps_server_nested_b_port: + ps_server_nested2_1b: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server_nested2_1b + properties: + availability_zone: + get_input: + - compute_ps_server_nested2_1b_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_nested2_1b_name + - index_value + ps_server_nested2_1b_ps_server_nested2_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps_server_nested_b_port_exCP_naming + get_input: port_ps_server_nested2_1b_port_exCP_naming replacement_policy: get_input: - - port_ps_server_nested_b_port_replacement_policy + - port_ps_server_nested2_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_ps_server_nested_b_port_vlan_requirements + get_input: port_ps_server_nested2_1b_port_vlan_requirements ip_requirements: - get_input: port_ps_server_nested_b_port_ip_requirements + get_input: port_ps_server_nested2_1b_port_ip_requirements network_role_tag: - get_input: port_ps_server_nested_b_port_network_role_tag + get_input: port_ps_server_nested2_1b_port_network_role_tag mac_requirements: - get_input: port_ps_server_nested_b_port_mac_requirements + get_input: port_ps_server_nested2_1b_port_mac_requirements order: - get_input: port_ps_server_nested_b_port_order + get_input: port_ps_server_nested2_1b_port_order network_role: - get_input: port_ps_server_nested_b_port_network_role + get_input: port_ps_server_nested2_1b_port_network_role subnetpoolid: - get_input: port_ps_server_nested_b_port_subnetpoolid + get_input: port_ps_server_nested2_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_nested_b_port_fixed_ips + get_input: port_ps_server_nested2_1b_port_fixed_ips network: get_input: - - port_ps_server_nested_b_port_network + - port_ps_server_nested2_1b_port_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_nested2_1b relationship: tosca.relationships.network.BindsTo - ps_server_nested2_1b: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server_nested2_1b - properties: - availability_zone: - get_input: - - compute_ps_server_nested2_1b_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_nested2_1b_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b capabilities: disk.device.read.bytes.rate_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.read.bytes.rate - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.incoming.packets.rate disk.iops_ps_server_nested2_1b: - ps_server_nested2_1b - disk.iops vcpus_ps_server_nested2_1b: - ps_server_nested2_1b - vcpus - network.outgoing.packets.rate_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.outgoing.packets.rate instance_ps_server_nested2_1b: - ps_server_nested2_1b - instance - network.incoming.packets_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.incoming.packets disk.usage_ps_server_nested2_1b: - ps_server_nested2_1b - disk.usage @@ -163,6 +154,9 @@ topology_template: disk.read.bytes_ps_server_nested2_1b: - ps_server_nested2_1b - disk.read.bytes + network.incoming.packets_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.incoming.packets disk.device.allocation_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.allocation @@ -172,9 +166,6 @@ topology_template: memory.resident_ps_server_nested2_1b: - ps_server_nested2_1b - memory.resident - network.outpoing.packets_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.outpoing.packets disk.ephemeral.size_ps_server_nested2_1b: - ps_server_nested2_1b - disk.ephemeral.size @@ -193,45 +184,57 @@ topology_template: disk.read.bytes.rate_ps_server_nested2_1b: - ps_server_nested2_1b - disk.read.bytes.rate + network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.incoming.bytes scalable_ps_server_nested2_1b: - ps_server_nested2_1b - scalable disk.write.requests.rate_ps_server_nested2_1b: - ps_server_nested2_1b - disk.write.requests.rate + network.outgoing.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.outgoing.bytes.rate + network.outgoing.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.outgoing.packets.rate + network.outpoing.packets_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.outpoing.packets cpu_util_ps_server_nested2_1b: - ps_server_nested2_1b - cpu_util - network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.outgoing.bytes + network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.incoming.bytes.rate disk.read.requests_ps_server_nested2_1b: - ps_server_nested2_1b - disk.read.requests + network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.outgoing.bytes disk.write.requests_ps_server_nested2_1b: - ps_server_nested2_1b - disk.write.requests memory_ps_server_nested2_1b: - ps_server_nested2_1b - memory - binding_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - binding disk.device.read.requests.rate_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.read.requests.rate disk.device.latency_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.latency - feature_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - feature - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.incoming.bytes + network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - network.incoming.packets.rate disk.latency_ps_server_nested2_1b: - ps_server_nested2_1b - disk.latency + feature_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - feature disk.device.write.requests.rate_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.write.requests.rate @@ -253,18 +256,12 @@ topology_template: disk.root.size_ps_server_nested2_1b: - ps_server_nested2_1b - disk.root.size - network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.incoming.bytes.rate disk.device.write.requests_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.write.requests disk.device.iops_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.iops - attachment_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - attachment os_ps_server_nested2_1b: - ps_server_nested2_1b - os @@ -277,15 +274,18 @@ topology_template: cpu_ps_server_nested2_1b: - ps_server_nested2_1b - cpu + binding_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - binding + attachment_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - attachment disk.device.read.requests_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.read.requests disk.device.write.bytes.rate_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.write.bytes.rate - network.outgoing.bytes.rate_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - network.outgoing.bytes.rate requirements: local_storage_ps_server_nested2_1b: - ps_server_nested2_1b @@ -293,9 +293,9 @@ topology_template: dependency_ps_server_nested2_1b: - ps_server_nested2_1b - dependency - link_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port - - link - dependency_ps_server_nested2_1b_ps_server_nested_b_port: - - ps_server_nested2_1b_ps_server_nested_b_port + dependency_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port - dependency + link_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml index c411944118..cc6778d633 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml @@ -135,34 +135,34 @@ topology_template: directives: - substitutable properties: - compute_ps_server_main_1b_availability_zone: - - get_input: availability_zone_0 - port_ps_server_main_b_port_replacement_policy: - - AUTO - port_ps_server_main_b_port_ip_requirements: + port_ps_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_main_1b_ips + - 0 + port_ps_server_main_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_ps_server_main_1b_availability_zone: + - get_input: availability_zone_0 vm_flavor_name: get_input: ps_server_main_1b_flavor - port_ps_server_main_b_port_network: - - get_input: jsa_name - port_ps_server_main_b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_main_b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_main_1b_ips - - 0 vm_image_name: get_input: ps_server_main_1b_image compute_ps_server_main_1b_name: - get_input: - ps_server_main_1b_names - 1 + port_ps_server_main_1b_port_replacement_policy: + - AUTO + port_ps_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_main_1b_port_network: + - get_input: jsa_name service_template_filter: substitute_service_template: Nested_ps_server_main_1bServiceTemplate.yaml count: 1 @@ -224,32 +224,32 @@ topology_template: properties: compute_pd_server_main_1b_availability_zone: - get_input: availability_zone_0 - port_pd_server_main_b_port_replacement_policy: + port_pd_server_main_1b_port_replacement_policy: - AUTO + port_pd_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pd_server_main_1b_flavor - port_pd_server_main_b_port_fixed_ips: - - ip_address: - get_input: - - pd_server_main_1b_ips - - 0 - port_pd_server_main_b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_server_main_1b_image - port_pd_server_main_b_port_mac_requirements: - mac_count_required: - is_required: false compute_pd_server_main_1b_name: - get_input: - pd_server_main_1b_names - 0 - port_pd_server_main_b_port_network: + port_pd_server_main_1b_port_network: - get_input: jsa_name + port_pd_server_main_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pd_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_main_1b_ips + - 0 service_template_filter: substitute_service_template: Nested_pd_server_main_1bServiceTemplate.yaml count: 1 @@ -468,7 +468,7 @@ topology_template: - binding_ps_server_main_1b network.outgoing.bytes.rate_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_b_port + - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port binding_cmaui_port_1: - abstract_cmaui_1c1_main - binding_cmaui_1c1_main_cmaui_port @@ -660,10 +660,10 @@ topology_template: - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file attachment_pd_server_main_1b_port: - abstract_pd_server_main_1b - - attachment_pd_server_main_1b_pd_server_main_b_port + - attachment_pd_server_main_1b_pd_server_main_1b_port feature_ps_server_main_1b_port: - abstract_ps_server_main_1b - - feature_ps_server_main_1b_ps_server_main_b_port + - feature_ps_server_main_1b_ps_server_main_1b_port disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.root.size_server_nested2_1c1_cmaui_1 @@ -681,7 +681,7 @@ topology_template: - disk.device.read.requests_pd_server_main_1b network.incoming.bytes.rate_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_b_port + - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port disk.allocation_server_main_pd_1b: - abstract_pd_server_main_1b - disk.allocation_pd_server_main_1b @@ -759,7 +759,7 @@ topology_template: - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1 network.outpoing.packets_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.outpoing.packets_ps_server_main_1b_ps_server_main_b_port + - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port feature_pd_server_pattern4_port_2_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - feature_pd_server_pattern4_port_2 @@ -774,7 +774,7 @@ topology_template: - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file network.outgoing.bytes_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.outgoing.bytes_ps_server_main_1b_ps_server_main_b_port + - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port disk.ephemeral.size_server_main_pd_1b: - abstract_pd_server_main_1b - disk.ephemeral.size_pd_server_main_1b @@ -942,7 +942,7 @@ topology_template: - scalable_server_nested2_pd_1b network.outgoing.packets.rate_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_b_port + - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port disk.device.write.bytes.rate_server_main_ps_1b: - abstract_ps_server_main_1b - disk.device.write.bytes.rate_ps_server_main_1b @@ -999,7 +999,7 @@ topology_template: - binding_server_pd_pattern4_test_nested_pattern_4_nested2 network.outgoing.bytes_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.outgoing.bytes_pd_server_main_1b_pd_server_main_b_port + - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port instance_server_main_ps_1b: - abstract_ps_server_main_1b - instance_ps_server_main_1b @@ -1080,7 +1080,7 @@ topology_template: - disk.device.latency_server_pd_pattern4 network.outgoing.packets.rate_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_b_port + - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file @@ -1257,7 +1257,7 @@ topology_template: - disk.read.bytes.rate_server_nested2_ps_1b network.incoming.bytes_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.incoming.bytes_pd_server_main_1b_pd_server_main_b_port + - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port endpoint_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - endpoint_server_nested2_1c1_cmaui_1 @@ -1416,7 +1416,7 @@ topology_template: - cpu_server_pd_pattern4_test_nested_pattern_4_nested2 network.outpoing.packets_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.outpoing.packets_pd_server_main_1b_pd_server_main_b_port + - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - network.outpoing.packets_pd_server_pattern4_port_2 @@ -1497,7 +1497,7 @@ topology_template: - memory_server_nested2_1c1_cmaui_2 attachment_ps_server_main_1b_port: - abstract_ps_server_main_1b - - attachment_ps_server_main_1b_ps_server_main_b_port + - attachment_ps_server_main_1b_ps_server_main_1b_port disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_nested2_pd_1b @@ -1524,7 +1524,7 @@ topology_template: - feature_jsa_security_group1_test_resourceGroup network.outgoing.bytes.rate_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_b_port + - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port cpu_server_main_ps_1b: - abstract_ps_server_main_1b - cpu_ps_server_main_1b @@ -1710,7 +1710,7 @@ topology_template: - network.outgoing.bytes_pd_server_pattern4_port_1 feature_pd_server_main_1b_port: - abstract_pd_server_main_1b - - feature_pd_server_main_1b_pd_server_main_b_port + - feature_pd_server_main_1b_pd_server_main_1b_port disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.write.requests.rate_server_pd_pattern4 @@ -1755,7 +1755,7 @@ topology_template: - feature_server_nested2_1c1_cmaui_1 network.incoming.packets.rate_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_b_port + - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -1779,7 +1779,7 @@ topology_template: - disk.device.capacity_server_nested2_pd_1b network.incoming.bytes.rate_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_b_port + - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port disk.latency_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.latency_server_pd_pattern4 @@ -1830,13 +1830,13 @@ topology_template: - feature_pd_server_nested2_1b_port network.incoming.packets_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.incoming.packets_ps_server_main_1b_ps_server_main_b_port + - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port binding_cmaui_port_2_test_nested2Level: - test_nested2Level - binding_cmaui_port_2 binding_pd_server_main_1b_port: - abstract_pd_server_main_1b - - binding_pd_server_main_1b_pd_server_main_b_port + - binding_pd_server_main_1b_pd_server_main_1b_port binding_server_main_1c1_cmaui_1: - abstract_cmaui_1c1_main - binding_cmaui_1c1_main @@ -1872,7 +1872,7 @@ topology_template: - scalable_server_nested2_1c1_cmaui_2 network.incoming.packets_pd_server_main_1b_port: - abstract_pd_server_main_1b - - network.incoming.packets_pd_server_main_1b_pd_server_main_b_port + - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port memory_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - memory_server_nested2_pd_1b @@ -1977,7 +1977,7 @@ topology_template: - disk.device.write.requests.rate_server_nested2_1c1_cmaui_2 network.incoming.bytes_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.incoming.bytes_ps_server_main_1b_ps_server_main_b_port + - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port scalable_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - scalable_server_nested2_1c1_cmaui_1 @@ -2049,7 +2049,7 @@ topology_template: - disk.device.write.bytes.rate_server_pd_pattern4 network.incoming.packets.rate_ps_server_main_1b_port: - abstract_ps_server_main_1b - - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_b_port + - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port disk.device.latency_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.latency_server_nested2_pd_1b @@ -2097,7 +2097,7 @@ topology_template: - network.incoming.packets_pd_server_pattern4_port_2 binding_ps_server_main_1b_port: - abstract_ps_server_main_1b - - binding_ps_server_main_1b_ps_server_main_b_port + - binding_ps_server_main_1b_ps_server_main_1b_port feature_test_resourceGroup_test_nested2Level: - test_nested2Level - feature_test_resourceGroup @@ -2134,7 +2134,7 @@ topology_template: - dependency_jsa_security_group2_test_resourceGroup dependency_pd_server_main_1b_port: - abstract_pd_server_main_1b - - dependency_pd_server_main_1b_pd_server_main_b_port + - dependency_pd_server_main_1b_pd_server_main_1b_port dependency_cmaui_port_2_test_nested2Level: - test_nested2Level - dependency_cmaui_port_2 @@ -2182,7 +2182,7 @@ topology_template: - local_storage_server_nested2_1c1_cmaui_2 dependency_ps_server_main_1b_port: - abstract_ps_server_main_1b - - dependency_ps_server_main_1b_ps_server_main_b_port + - dependency_ps_server_main_1b_ps_server_main_1b_port dependency_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_nested2 @@ -2233,7 +2233,7 @@ topology_template: - dependency_server_pd_pattern4_test_nested_pattern_4_nested2 link_ps_server_main_1b_port: - abstract_ps_server_main_1b - - link_ps_server_main_1b_ps_server_main_b_port + - link_ps_server_main_1b_ps_server_main_1b_port dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file @@ -2242,7 +2242,7 @@ topology_template: - dependency_cmaui_port_1 link_pd_server_main_1b_port: - abstract_pd_server_main_1b - - link_pd_server_main_1b_pd_server_main_b_port + - link_pd_server_main_1b_pd_server_main_1b_port local_storage_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - local_storage_server_pd_pattern4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index 935ec13ca3..c851f7f561 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -108,11 +108,16 @@ topology_template: directives: - substitutable properties: - port_pd_server_nested_b_port_fixed_ips: + port_pd_server_nested2_1b_port_replacement_policy: + - AUTO + port_pd_server_nested2_1b_port_fixed_ips: - ip_address: get_input: - pd_server_nested2_1b_ips - 0 + port_pd_server_nested2_1b_port_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: pd_server_nested2_1b_flavor compute_pd_server_nested2_1b_availability_zone: @@ -121,21 +126,16 @@ topology_template: - get_input: - pd_server_nested2_1b_names - 0 - port_pd_server_nested_b_port_network: - - get_input: jsa_name - port_pd_server_nested_b_port_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_nested_b_port_replacement_policy: - - AUTO vm_image_name: get_input: pd_server_nested2_1b_image - port_pd_server_nested_b_port_ip_requirements: + port_pd_server_nested2_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pd_server_nested2_1b_port_network: + - get_input: jsa_name service_template_filter: substitute_service_template: Nested_pd_server_nested2_1bServiceTemplate.yaml count: 1 @@ -212,34 +212,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_nested_b_port_replacement_policy: - - AUTO - port_ps_server_nested_b_port_ip_requirements: + port_ps_server_nested2_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_ps_server_nested_b_port_network: - - get_input: jsa_name compute_ps_server_nested2_1b_name: - get_input: - ps_server_nested2_1b_names - 1 compute_ps_server_nested2_1b_availability_zone: - get_input: availability_zone_0 + port_ps_server_nested2_1b_port_replacement_policy: + - AUTO vm_flavor_name: get_input: ps_server_nested2_1b_flavor - port_ps_server_nested_b_port_fixed_ips: + port_ps_server_nested2_1b_port_network: + - get_input: jsa_name + vm_image_name: + get_input: ps_server_nested2_1b_image + port_ps_server_nested2_1b_port_fixed_ips: - ip_address: get_input: - ps_server_nested2_1b_ips - 0 - port_ps_server_nested_b_port_mac_requirements: + port_ps_server_nested2_1b_port_mac_requirements: mac_count_required: is_required: false - vm_image_name: - get_input: ps_server_nested2_1b_image service_template_filter: substitute_service_template: Nested_ps_server_nested2_1bServiceTemplate.yaml count: 1 @@ -339,7 +339,7 @@ topology_template: - network.incoming.packets_pd_server_pattern4_port_2 network.incoming.packets.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested_b_port + - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port os_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - os_pd_server_nested2_1b @@ -384,13 +384,13 @@ topology_template: - disk.device.read.requests.rate_server_pd_pattern4 network.outgoing.packets.rate_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.outgoing.packets.rate_ps_server_nested2_1b_ps_server_nested_b_port + - network.outgoing.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port memory.resident_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - memory.resident_ps_server_nested2_1b network.outpoing.packets_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.outpoing.packets_pd_server_nested2_1b_pd_server_nested_b_port + - network.outpoing.packets_pd_server_nested2_1b_pd_server_nested2_1b_port disk.device.read.bytes_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.bytes_cmaui_1c1_nested2 @@ -432,7 +432,7 @@ topology_template: - feature network.outgoing.bytes.rate_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.outgoing.bytes.rate_ps_server_nested2_1b_ps_server_nested_b_port + - network.outgoing.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port memory_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - memory_server_pd_pattern4 @@ -444,7 +444,7 @@ topology_template: - disk.write.bytes.rate_cmaui_1c1_nested2 attachment_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - attachment_ps_server_nested2_1b_ps_server_nested_b_port + - attachment_ps_server_nested2_1b_ps_server_nested2_1b_port binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - binding_pd_server_pattern4_port_1 @@ -456,7 +456,7 @@ topology_template: - cpu_util_pd_server_nested2_1b network.incoming.packets_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.incoming.packets_pd_server_nested2_1b_pd_server_nested_b_port + - network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_1b_port network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - network.incoming.bytes.rate_pd_server_pattern4_port_1 @@ -522,7 +522,7 @@ topology_template: - disk.read.requests_ps_server_nested2_1b network.incoming.bytes_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested_b_port + - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.requests_server_pd_pattern4 @@ -684,7 +684,7 @@ topology_template: - endpoint_ps_server_nested2_1b network.incoming.bytes_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested_b_port + - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port vcpus_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - vcpus_server_pd_pattern4 @@ -708,7 +708,7 @@ topology_template: - disk.usage_server_pd_pattern4 network.outgoing.bytes_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested_b_port + - network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port disk.write.requests_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.write.requests_pd_server_nested2_1b @@ -729,7 +729,7 @@ topology_template: - disk.device.allocation_server_pd_pattern4 feature_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - feature_pd_server_nested2_1b_pd_server_nested_b_port + - feature_pd_server_nested2_1b_pd_server_nested2_1b_port cpu_util_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - cpu_util_ps_server_nested2_1b @@ -765,10 +765,10 @@ topology_template: - os_cmaui_1c1_nested2 network.incoming.bytes.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested_b_port + - network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port attachment_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - attachment_pd_server_nested2_1b_pd_server_nested_b_port + - attachment_pd_server_nested2_1b_pd_server_nested2_1b_port disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.allocation_server_pd_pattern4 @@ -786,7 +786,7 @@ topology_template: - memory.resident_pd_server_nested2_1b network.outgoing.packets.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.outgoing.packets.rate_pd_server_nested2_1b_pd_server_nested_b_port + - network.outgoing.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port disk.device.usage_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.usage_cmaui_1c1_nested2 @@ -801,7 +801,7 @@ topology_template: - disk.write.requests.rate_server_pd_pattern4 network.outpoing.packets_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.outpoing.packets_ps_server_nested2_1b_ps_server_nested_b_port + - network.outpoing.packets_ps_server_nested2_1b_ps_server_nested2_1b_port feature_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - feature_ps_server_nested2_1b @@ -834,16 +834,16 @@ topology_template: - attachment_pd_server_pattern4_port_2 network.outgoing.bytes.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested_b_port + - network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port network.incoming.packets.rate_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested_b_port + - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port disk.device.read.requests_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.requests_cmaui_1c1_nested2 binding_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - binding_ps_server_nested2_1b_ps_server_nested_b_port + - binding_ps_server_nested2_1b_ps_server_nested2_1b_port host_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - host_server_pd_pattern4 @@ -945,7 +945,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_nested2_1b network.incoming.packets_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.incoming.packets_ps_server_nested2_1b_ps_server_nested_b_port + - network.incoming.packets_ps_server_nested2_1b_ps_server_nested2_1b_port binding_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - binding_pd_server_nested2_1b @@ -1224,7 +1224,7 @@ topology_template: - disk.iops_cmaui_1c1_nested2 feature_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - feature_ps_server_nested2_1b_ps_server_nested_b_port + - feature_ps_server_nested2_1b_ps_server_nested2_1b_port disk.iops_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.iops_cmaui_1c1_nested2 @@ -1308,13 +1308,13 @@ topology_template: - disk.read.bytes.rate_pd_server_nested2_1b binding_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - binding_pd_server_nested2_1b_pd_server_nested_b_port + - binding_pd_server_nested2_1b_pd_server_nested2_1b_port disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.root.size_server_pd_pattern4 network.incoming.bytes.rate_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested_b_port + - network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.bytes.rate_server_pd_pattern4 @@ -1341,7 +1341,7 @@ topology_template: - network.outpoing.packets_pd_server_pattern4_port_1 network.outgoing.bytes_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested_b_port + - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port disk.device.allocation_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.allocation_cmaui_1c1_nested2 @@ -1375,7 +1375,7 @@ topology_template: - dependency_pd_server_pattern4_port_2 link_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - link_ps_server_nested2_1b_ps_server_nested_b_port + - link_ps_server_nested2_1b_ps_server_nested2_1b_port dependency_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - dependency_ps_server_nested2_1b @@ -1417,7 +1417,7 @@ topology_template: - dependency_cmaui_1c1_nested2_cmaui_port link_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - link_pd_server_nested2_1b_pd_server_nested_b_port + - link_pd_server_nested2_1b_pd_server_nested2_1b_port dependency_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - dependency_server_pd_pattern4 @@ -1432,7 +1432,7 @@ topology_template: - local_storage_server_pd_pattern4 dependency_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - - dependency_pd_server_nested2_1b_pd_server_nested_b_port + - dependency_pd_server_nested2_1b_pd_server_nested2_1b_port port_jsa_security_group1_test_nested3Level: - test_nested3Level - port_jsa_security_group1 @@ -1441,7 +1441,7 @@ topology_template: - link_pd_server_pattern4_port_1 dependency_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - - dependency_ps_server_nested2_1b_ps_server_nested_b_port + - dependency_ps_server_nested2_1b_ps_server_nested2_1b_port dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - dependency_pd_server_pattern4_port_2 -- cgit 1.2.3-korg