diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios')
25 files changed, 2415 insertions, 2415 deletions
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: + 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: @@ -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 + 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 @@ -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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8ba567db2c..ae6c22ede7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,10 +14,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_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 @@ -30,17 +26,13 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_network_role_tag: type: string required: true status: SUPPORTED @@ -48,27 +40,27 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_b_port_ip_requirements: + port_pd_server_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_b_port_network: - type: list + type: string + port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd_server_b_port_network_role_tag: + port_pd_server_1b_port_network_role: type: string required: true status: SUPPORTED - port_pd_server_b_port_network_role: - type: string + port_pd_server_1b_port_fixed_ips: + type: list required: true status: SUPPORTED - port_pd_server_b_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_network: type: list required: true status: SUPPORTED @@ -80,16 +72,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_b_port_order: + port_pd_server_1b_port_order: type: integer required: true status: SUPPORTED - port_pd_server_b_port_vlan_requirements: + port_pd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_subnetpoolid: + type: string + required: true + status: SUPPORTED attributes: pd_server_1b_accessIPv4: type: string @@ -109,14 +109,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_b_port: + - dependency_pd_server_1b_pd_server_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_b_port: + - link_pd_server_1b_pd_server_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -129,6 +129,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -142,37 +147,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_b_port: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port: + cpu.delta_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - cpu.delta_pd_server_1b: + network.incoming.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -195,6 +188,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -230,8 +230,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.Attachment + network.outpoing.packets_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -265,25 +266,30 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port: + disk.latency_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_pd_server_1b: + disk.ephemeral.size_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -318,12 +324,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_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.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -347,6 +347,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -364,19 +370,19 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_pd_server_1b: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_b_port: + memory.resident_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -400,7 +406,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_b_port: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -418,12 +424,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_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.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1841,7 +1841,7 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED @@ -1853,18 +1853,20 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1873,50 +1875,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true status: SUPPORTED - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true status: SUPPORTED - port_ps_server_b_port_network: + port_ps_server_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_1b_availability_zone: type: list required: true @@ -1924,19 +1924,6 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_1b_ps_server_b_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_1b_ps_server_b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1951,6 +1938,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pd_server_1b_ps_server_1b_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_1b_ps_server_1b_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: disk.device.read.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -1965,6 +1965,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1977,12 +1983,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_ps_server_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu.delta_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2000,7 +2023,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_ps_server_b_port: + network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2012,13 +2035,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_ps_server_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.write.bytes.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2042,19 +2058,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_ps_server_b_port: + memory.usage_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_pd_server_1b: + memory_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_pd_server_1b: + network.outgoing.bytes_pd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2084,23 +2100,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_ps_server_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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_ps_server_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.latency_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2113,11 +2118,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_ps_server_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_pd_server_1b_ps_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED scalable_pd_server_1b: type: tosca.capabilities.Scalable @@ -2148,18 +2154,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_ps_server_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.incoming.packets_pd_server_1b_ps_server_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.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2189,6 +2183,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_pd_server_1b: type: tosca.capabilities.network.Bindable occurrences: @@ -2206,48 +2206,48 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_ps_server_b_port: + network.incoming.packets.rate_pd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_ps_server_1b_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.capacity_pd_server_1b: + network.incoming.bytes_pd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server_1b: + disk.device.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_ps_server_b_port: - type: tosca.capabilities.Attachment + disk.device.capacity_pd_server_1b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server_1b: + disk.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_pd_server_1b: + disk.capacity_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_ps_server_b_port: + disk.usage_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5269,24 +5269,26 @@ node_types: org.openecomp.resource.abstract.nodes.rd_server_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5301,65 +5303,63 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true status: SUPPORTED - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true status: SUPPORTED - compute_rd_server_1b_name: + port_ps_server_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_b_port_network: + compute_rd_server_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_rd_server_1b_ps_server_b_port: + - dependency_rd_server_1b_ps_server_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_rd_server_1b_ps_server_b_port: + - link_rd_server_1b_ps_server_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -5427,7 +5427,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_rd_server_1b_ps_server_b_port: + network.incoming.bytes_rd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5439,6 +5439,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_rd_server_1b_ps_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.latency_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5463,12 +5470,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_rd_server_1b_ps_server_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.rate_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5480,8 +5481,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_rd_server_1b_ps_server_b_port: - type: tosca.capabilities.Attachment + network.outpoing.packets_rd_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -5497,18 +5499,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_rd_server_1b_ps_server_b_port: + disk.device.allocation_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_rd_server_1b: + network.incoming.packets_rd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + feature_rd_server_1b_ps_server_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5527,19 +5534,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_rd_server_1b_ps_server_b_port: + memory_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_rd_server_1b: + disk.write.bytes_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_rd_server_1b: + network.outgoing.packets.rate_rd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5550,53 +5557,42 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_rd_server_1b: + network.incoming.packets.rate_rd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_rd_server_1b: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - memory.resident_rd_server_1b: + network.outgoing.bytes_rd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_rd_server_1b: + disk.read.bytes_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_rd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_rd_server_1b: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_rd_server_1b_ps_server_b_port: + memory.resident_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_rd_server_1b_ps_server_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_rd_server_1b_ps_server_b_port: + disk.read.requests_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_rd_server_1b_ps_server_b_port: + disk.ephemeral.size_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5632,6 +5628,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_rd_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED cpu.delta_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5657,13 +5659,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_rd_server_1b_ps_server_b_port: + attachment_rd_server_1b_ps_server_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.iops_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_rd_server_1b: + network.outgoing.bytes.rate_rd_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5674,13 +5681,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_rd_server_1b_ps_server_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED memory.usage_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5690,8 +5690,14 @@ node_types: org.openecomp.resource.abstract.nodes.rd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_rd_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_rd_server_1b_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_rd_server_1b_port_order: + type: integer required: true status: SUPPORTED index_value: @@ -5712,37 +5718,29 @@ node_types: type: string required: true status: SUPPORTED - port_rd_server_b_port_replacement_policy: + port_rd_server_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_rd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + port_rd_server_1b_port_network_role_tag: type: string required: true status: SUPPORTED - port_rd_server_b_port_network: - type: list + port_rd_server_1b_port_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED - port_rd_server_b_port_order: - type: integer - required: true - status: SUPPORTED - port_rd_server_b_port_ip_requirements: - type: list + port_rd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_rd_server_b_port_network_role: + port_rd_server_1b_port_subnetpoolid: type: string required: true status: SUPPORTED @@ -5752,39 +5750,41 @@ node_types: status: SUPPORTED entry_schema: type: string - port_rd_server_b_port_fixed_ips: + port_rd_server_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_rd_server_b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_rd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_rd_server_1b_port_replacement_policy: + type: list required: true status: SUPPORTED - port_rd_server_b_port_vlan_requirements: + entry_schema: + type: string + port_rd_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_rd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED attributes: rd_server_1b_accessIPv4: type: string status: SUPPORTED requirements: - - dependency_rd_server_1b_rd_server_b_port: + - dependency_rd_server_1b_rd_server_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_rd_server_1b_rd_server_b_port: + - link_rd_server_1b_rd_server_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -5805,13 +5805,15 @@ node_types: - 0 - UNBOUNDED capabilities: - attachment_rd_server_1b_rd_server_b_port: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_rd_server_1b_rd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_rd_server_1b_rd_server_b_port: - type: tosca.capabilities.Node + network.incoming.packets_rd_server_1b_rd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -5839,24 +5841,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_rd_server_1b_rd_server_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_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_rd_server_1b_rd_server_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_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5892,7 +5882,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_rd_server_1b_rd_server_b_port: + network.incoming.bytes_rd_server_1b_rd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_rd_server_1b_rd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5939,13 +5935,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_rd_server_1b_rd_server_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.requests_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5964,6 +5953,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_rd_server_1b_rd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_rd_server_1b_rd_server_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED memory_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5981,20 +5981,20 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_rd_server_1b: + network.outgoing.packets.rate_rd_server_1b_rd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_rd_server_1b: - type: tosca.capabilities.Node + disk.read.bytes_rd_server_1b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_rd_server_1b_rd_server_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. + feature_rd_server_1b: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6034,6 +6034,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_rd_server_1b_rd_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.iops_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6065,50 +6072,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_rd_server_1b_rd_server_b_port: + disk.allocation_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_rd_server_1b_rd_server_b_port: + network.outpoing.packets_rd_server_1b_rd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_rd_server_1b_rd_server_b_port: + disk.iops_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_rd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_rd_server_1b: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_rd_server_1b_rd_server_b_port: + network.outgoing.bytes_rd_server_1b_rd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_rd_server_1b: + memory.usage_rd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_rd_server_1b: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - memory.usage_rd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_rd_server_1b_rd_server_1b_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index e9b295a2d9..581e296e13 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -134,34 +134,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_mac_requirements: + mac_count_required: is_required: false - port_ps_server_b_port_replacement_policy: - - AUTO - compute_rd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_ps_server_b_port_fixed_ips: + port_ps_server_1b_port_fixed_ips: - ip_address: get_input: - ps_server_1b_ips - 0 + compute_rd_server_1b_availability_zone: + - get_input: availability_zone_0 vm_flavor_name: get_input: rd_server_1b_flavor - port_ps_server_b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false vm_image_name: get_input: rd_server_1b_image + port_ps_server_1b_port_replacement_policy: + - AUTO compute_rd_server_1b_name: - get_input: - rd_server_1b_names - 1 - port_ps_server_b_port_network: - - get_input: net service_template_filter: substitute_service_template: Nested_rd_server_1b_1ServiceTemplate.yaml count: 1 @@ -193,34 +193,34 @@ topology_template: directives: - substitutable properties: + port_rd_server_1b_port_network: + - get_input: net compute_rd_server_1b_availability_zone: - get_input: availability_zone_0 vm_flavor_name: get_input: rd_server_1b_flavor - port_rd_server_b_port_replacement_policy: - - AUTO - port_rd_server_b_port_network: - - get_input: net - vm_image_name: - get_input: rd_server_1b_image - port_rd_server_b_port_ip_requirements: + port_rd_server_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_image_name: + get_input: rd_server_1b_image + port_rd_server_1b_port_mac_requirements: + mac_count_required: + is_required: false compute_rd_server_1b_name: - get_input: - rd_server_1b_names - 0 - port_rd_server_b_port_fixed_ips: + port_rd_server_1b_port_fixed_ips: - ip_address: get_input: - rd_server_1b_ips - 0 - port_rd_server_b_port_mac_requirements: - mac_count_required: - is_required: false + port_rd_server_1b_port_replacement_policy: + - AUTO service_template_filter: substitute_service_template: Nested_rd_server_1bServiceTemplate.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/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml index 70c67e0735..b3373b5408 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml @@ -11,7 +11,7 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true entry_schema: @@ -21,16 +21,17 @@ topology_template: required: true entry_schema: type: string - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + port_ps_server_1b_port_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -38,95 +39,94 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_b_port_network_role: - type: string - required: true - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true - port_ps_server_b_port_network: + port_ps_server_1b_port_replacement_policy: type: list required: true entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string node_templates: - pd_server_1b_ps_server_b_port: + pd_server_1b: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b + properties: + availability_zone: + get_input: + - compute_pd_server_1b_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_1b_name + - index_value + pd_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps_server_b_port_exCP_naming + get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - - port_ps_server_b_port_replacement_policy + - port_ps_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_ps_server_b_port_vlan_requirements + get_input: port_ps_server_1b_port_vlan_requirements ip_requirements: - get_input: port_ps_server_b_port_ip_requirements + get_input: port_ps_server_1b_port_ip_requirements network_role_tag: - get_input: port_ps_server_b_port_network_role_tag + get_input: port_ps_server_1b_port_network_role_tag mac_requirements: - get_input: port_ps_server_b_port_mac_requirements + get_input: port_ps_server_1b_port_mac_requirements order: - get_input: port_ps_server_b_port_order + get_input: port_ps_server_1b_port_order network_role: - get_input: port_ps_server_b_port_network_role + get_input: port_ps_server_1b_port_network_role subnetpoolid: - get_input: port_ps_server_b_port_subnetpoolid + get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_b_port_fixed_ips + get_input: port_ps_server_1b_port_fixed_ips network: get_input: - - port_ps_server_b_port_network + - port_ps_server_1b_port_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo - pd_server_1b: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b - properties: - availability_zone: - get_input: - - compute_pd_server_1b_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_1b_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b capabilities: @@ -136,15 +136,27 @@ topology_template: host_pd_server_1b: - pd_server_1b - host + network.outpoing.packets_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - network.outpoing.packets disk.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.read.bytes.rate disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation + network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - network.incoming.bytes.rate + feature_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - feature cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta + network.incoming.packets_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - network.incoming.packets disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -154,15 +166,12 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - network.outgoing.bytes.rate_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port + network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port - network.outgoing.bytes.rate cpu_pd_server_1b: - pd_server_1b - cpu - binding_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - binding disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate @@ -175,15 +184,15 @@ topology_template: disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation - network.outgoing.bytes_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - network.outgoing.bytes memory.usage_pd_server_1b: - pd_server_1b - memory.usage memory_pd_server_1b: - pd_server_1b - memory + network.outgoing.bytes_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - network.outgoing.bytes disk.device.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.read.bytes.rate @@ -196,24 +205,18 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - network.outpoing.packets_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - network.outpoing.packets disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests - feature_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - feature disk.latency_pd_server_1b: - pd_server_1b - disk.latency disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.packets.rate_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - network.outgoing.packets.rate + binding_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - binding scalable_pd_server_1b: - pd_server_1b - scalable @@ -229,12 +232,6 @@ topology_template: disk.iops_pd_server_1b: - pd_server_1b - disk.iops - network.incoming.packets.rate_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - network.incoming.packets.rate - network.incoming.packets_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - network.incoming.packets disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -250,6 +247,9 @@ topology_template: instance_pd_server_1b: - pd_server_1b - instance + network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - network.outgoing.packets.rate binding_pd_server_1b: - pd_server_1b - binding @@ -259,8 +259,14 @@ topology_template: memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.bytes_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port + network.incoming.packets.rate_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - network.incoming.packets.rate + attachment_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port + - attachment + network.incoming.bytes_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port - network.incoming.bytes disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -271,18 +277,12 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - attachment_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - attachment disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage - network.incoming.bytes.rate_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port - - network.incoming.bytes.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -293,9 +293,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - dependency_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port + dependency_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_1b_port - dependency - link_pd_server_1b_ps_server_b_port: - - pd_server_1b_ps_server_b_port + link_pd_server_1b_ps_server_1b_port: + - pd_server_1b_ps_server_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/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 17108e5bae..0d2a6a0347 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_pd_server_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 @@ -29,37 +26,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_pd_server_b_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_b_port_network: + port_pd_server_1b_port_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_b_port_network_role_tag: - type: string + port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_server_b_port_network_role: + port_pd_server_1b_port_network_role: type: string required: true - port_pd_server_b_port_replacement_policy: + port_pd_server_1b_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_network: type: list required: true entry_schema: @@ -69,14 +63,20 @@ topology_template: required: true entry_schema: type: string - port_pd_server_b_port_order: + port_pd_server_1b_port_order: type: integer required: true - port_pd_server_b_port_vlan_requirements: + port_pd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_subnetpoolid: + type: string + required: true node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -93,34 +93,34 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_b_port: + pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_server_b_port_exCP_naming + get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - - port_pd_server_b_port_replacement_policy + - port_pd_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_pd_server_b_port_vlan_requirements + get_input: port_pd_server_1b_port_vlan_requirements ip_requirements: - get_input: port_pd_server_b_port_ip_requirements + get_input: port_pd_server_1b_port_ip_requirements network_role_tag: - get_input: port_pd_server_b_port_network_role_tag + get_input: port_pd_server_1b_port_network_role_tag mac_requirements: - get_input: port_pd_server_b_port_mac_requirements + get_input: port_pd_server_1b_port_mac_requirements order: - get_input: port_pd_server_b_port_order + get_input: port_pd_server_1b_port_order network_role: - get_input: port_pd_server_b_port_network_role + get_input: port_pd_server_1b_port_network_role subnetpoolid: - get_input: port_pd_server_b_port_subnetpoolid + get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_b_port_fixed_ips + get_input: port_pd_server_1b_port_fixed_ips network: get_input: - - port_pd_server_b_port_network + - port_pd_server_1b_port_network - index_value requirements: - binding: @@ -140,30 +140,27 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes + feature_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - feature host_pd_server_1b: - pd_server_1b - host disk.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.read.bytes.rate - feature_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - feature disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.bytes.rate - binding_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - binding + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta + network.incoming.bytes_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -173,6 +170,9 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops + binding_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -191,9 +191,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - attachment_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - attachment + network.outpoing.packets_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outpoing.packets memory_pd_server_1b: - pd_server_1b - memory @@ -209,18 +209,21 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage + attachment_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.bytes.rate disk.latency_pd_server_1b: - pd_server_1b - disk.latency disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate scalable_pd_server_1b: - pd_server_1b - scalable @@ -236,9 +239,6 @@ topology_template: disk.iops_pd_server_1b: - pd_server_1b - disk.iops - network.incoming.packets.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.packets.rate disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -251,6 +251,9 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -260,15 +263,15 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util + network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.bytes memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port - network.incoming.packets - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.packets.rate disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate @@ -278,18 +281,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outpoing.packets_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outpoing.packets + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage - network.outgoing.bytes_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.bytes disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -300,9 +300,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + link_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port - link - dependency_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + dependency_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_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/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml index 4b16f1f28b..b94ff90054 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml @@ -11,8 +11,13 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_rd_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_rd_server_1b_port_network: + type: list + required: true + entry_schema: + type: string + port_rd_server_1b_port_order: + type: integer required: true index_value: type: integer @@ -29,31 +34,24 @@ topology_template: vm_flavor_name: type: string required: true - port_rd_server_b_port_replacement_policy: + port_rd_server_1b_port_ip_requirements: type: list required: true entry_schema: - type: string - port_rd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + port_rd_server_1b_port_network_role_tag: type: string required: true - port_rd_server_b_port_network: - type: list + port_rd_server_1b_port_network_role: + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true - port_rd_server_b_port_order: - type: integer - required: true - port_rd_server_b_port_ip_requirements: - type: list + port_rd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_rd_server_b_port_network_role: + port_rd_server_1b_port_subnetpoolid: type: string required: true compute_rd_server_1b_name: @@ -61,51 +59,53 @@ topology_template: required: true entry_schema: type: string - port_rd_server_b_port_fixed_ips: + port_rd_server_1b_port_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_rd_server_b_port_network_role_tag: - type: string - required: true - port_rd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_rd_server_1b_port_replacement_policy: + type: list required: true - port_rd_server_b_port_vlan_requirements: + entry_schema: + type: string + port_rd_server_1b_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_rd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true node_templates: - rd_server_1b_rd_server_b_port: + rd_server_1b_rd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_rd_server_b_port_exCP_naming + get_input: port_rd_server_1b_port_exCP_naming replacement_policy: get_input: - - port_rd_server_b_port_replacement_policy + - port_rd_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_rd_server_b_port_vlan_requirements + get_input: port_rd_server_1b_port_vlan_requirements ip_requirements: - get_input: port_rd_server_b_port_ip_requirements + get_input: port_rd_server_1b_port_ip_requirements network_role_tag: - get_input: port_rd_server_b_port_network_role_tag + get_input: port_rd_server_1b_port_network_role_tag mac_requirements: - get_input: port_rd_server_b_port_mac_requirements + get_input: port_rd_server_1b_port_mac_requirements order: - get_input: port_rd_server_b_port_order + get_input: port_rd_server_1b_port_order network_role: - get_input: port_rd_server_b_port_network_role + get_input: port_rd_server_1b_port_network_role subnetpoolid: - get_input: port_rd_server_b_port_subnetpoolid + get_input: port_rd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_rd_server_b_port_fixed_ips + get_input: port_rd_server_1b_port_fixed_ips network: get_input: - - port_rd_server_b_port_network + - port_rd_server_1b_port_network - index_value requirements: - binding: @@ -137,12 +137,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.rd_server_1b capabilities: - attachment_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - attachment - feature_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - feature + network.outgoing.bytes.rate_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - network.outgoing.bytes.rate + network.incoming.packets_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - network.incoming.packets disk.usage_rd_server_1b: - rd_server_1b - disk.usage @@ -155,15 +155,9 @@ topology_template: disk.device.write.requests_rd_server_1b: - rd_server_1b - disk.device.write.requests - network.incoming.bytes_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - network.incoming.bytes disk.device.write.bytes_rd_server_1b: - rd_server_1b - disk.device.write.bytes - network.outgoing.bytes.rate_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - network.outgoing.bytes.rate disk.capacity_rd_server_1b: - rd_server_1b - disk.capacity @@ -182,8 +176,11 @@ topology_template: disk.device.read.bytes.rate_rd_server_1b: - rd_server_1b - disk.device.read.bytes.rate - network.incoming.bytes.rate_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port + network.incoming.bytes_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - network.incoming.bytes + network.incoming.bytes.rate_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port - network.incoming.bytes.rate disk.read.bytes.rate_rd_server_1b: - rd_server_1b @@ -206,9 +203,6 @@ topology_template: disk.device.allocation_rd_server_1b: - rd_server_1b - disk.device.allocation - binding_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - binding disk.device.read.requests_rd_server_1b: - rd_server_1b - disk.device.read.requests @@ -218,6 +212,12 @@ topology_template: disk.write.bytes.rate_rd_server_1b: - rd_server_1b - disk.write.bytes.rate + network.incoming.packets.rate_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - network.incoming.packets.rate + attachment_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - attachment memory_rd_server_1b: - rd_server_1b - memory @@ -227,15 +227,15 @@ topology_template: binding_rd_server_1b: - rd_server_1b - binding + network.outgoing.packets.rate_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - network.outgoing.packets.rate disk.read.bytes_rd_server_1b: - rd_server_1b - disk.read.bytes feature_rd_server_1b: - rd_server_1b - feature - network.incoming.packets.rate_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - network.incoming.packets.rate memory.resident_rd_server_1b: - rd_server_1b - memory.resident @@ -254,6 +254,9 @@ topology_template: disk.device.write.bytes.rate_rd_server_1b: - rd_server_1b - disk.device.write.bytes.rate + binding_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - binding disk.device.iops_rd_server_1b: - rd_server_1b - disk.device.iops @@ -269,40 +272,37 @@ topology_template: disk.device.capacity_rd_server_1b: - rd_server_1b - disk.device.capacity - network.outgoing.packets.rate_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - network.outgoing.packets.rate - network.incoming.packets_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - network.incoming.packets - network.outpoing.packets_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - network.outpoing.packets disk.allocation_rd_server_1b: - rd_server_1b - disk.allocation - network.outgoing.bytes_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port - - network.outgoing.bytes + network.outpoing.packets_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - network.outpoing.packets disk.iops_rd_server_1b: - rd_server_1b - disk.iops endpoint_rd_server_1b: - rd_server_1b - endpoint + network.outgoing.bytes_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - network.outgoing.bytes memory.usage_rd_server_1b: - rd_server_1b - memory.usage + feature_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - feature requirements: + dependency_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port + - dependency dependency_rd_server_1b: - rd_server_1b - dependency local_storage_rd_server_1b: - rd_server_1b - local_storage - link_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_port + link_rd_server_1b_rd_server_1b_port: + - rd_server_1b_rd_server_1b_port - link - dependency_rd_server_1b_rd_server_b_port: - - rd_server_1b_rd_server_b_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/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml index d5a219aa65..03f95284d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml @@ -11,21 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + port_ps_server_1b_port_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -38,74 +39,73 @@ topology_template: required: true entry_schema: type: string - port_ps_server_b_port_network_role: - type: string - required: true - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true - compute_rd_server_1b_name: + port_ps_server_1b_port_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_b_port_network: + compute_rd_server_1b_name: type: list required: true entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true node_templates: - rd_server_1b_ps_server_b_port: + rd_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps_server_b_port_exCP_naming + get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - - port_ps_server_b_port_replacement_policy + - port_ps_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_ps_server_b_port_vlan_requirements + get_input: port_ps_server_1b_port_vlan_requirements ip_requirements: - get_input: port_ps_server_b_port_ip_requirements + get_input: port_ps_server_1b_port_ip_requirements network_role_tag: - get_input: port_ps_server_b_port_network_role_tag + get_input: port_ps_server_1b_port_network_role_tag mac_requirements: - get_input: port_ps_server_b_port_mac_requirements + get_input: port_ps_server_1b_port_mac_requirements order: - get_input: port_ps_server_b_port_order + get_input: port_ps_server_1b_port_order network_role: - get_input: port_ps_server_b_port_network_role + get_input: port_ps_server_1b_port_network_role subnetpoolid: - get_input: port_ps_server_b_port_subnetpoolid + get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_b_port_fixed_ips + get_input: port_ps_server_1b_port_fixed_ips network: get_input: - - port_ps_server_b_port_network + - port_ps_server_1b_port_network - index_value requirements: - binding: @@ -154,12 +154,15 @@ topology_template: scalable_rd_server_1b: - rd_server_1b - scalable - network.outgoing.packets.rate_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.outgoing.packets.rate + network.incoming.bytes_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.incoming.bytes disk.device.usage_rd_server_1b: - rd_server_1b - disk.device.usage + binding_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - binding disk.device.latency_rd_server_1b: - rd_server_1b - disk.device.latency @@ -172,30 +175,30 @@ topology_template: disk.root.size_rd_server_1b: - rd_server_1b - disk.root.size - network.incoming.packets.rate_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.incoming.packets.rate disk.device.write.requests.rate_rd_server_1b: - rd_server_1b - disk.device.write.requests.rate os_rd_server_1b: - rd_server_1b - os - attachment_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - attachment + network.outpoing.packets_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.outpoing.packets disk.device.read.bytes_rd_server_1b: - rd_server_1b - disk.device.read.bytes disk.device.read.requests.rate_rd_server_1b: - rd_server_1b - disk.device.read.requests.rate - network.incoming.bytes_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.incoming.bytes disk.device.allocation_rd_server_1b: - rd_server_1b - disk.device.allocation + network.incoming.packets_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.incoming.packets + feature_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - feature disk.device.read.requests_rd_server_1b: - rd_server_1b - disk.device.read.requests @@ -205,18 +208,24 @@ topology_template: disk.write.bytes.rate_rd_server_1b: - rd_server_1b - disk.write.bytes.rate - network.outgoing.bytes_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.outgoing.bytes memory_rd_server_1b: - rd_server_1b - memory disk.write.bytes_rd_server_1b: - rd_server_1b - disk.write.bytes + network.outgoing.packets.rate_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.outgoing.packets.rate binding_rd_server_1b: - rd_server_1b - binding + network.incoming.packets.rate_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.incoming.packets.rate + network.outgoing.bytes_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.outgoing.bytes disk.read.bytes_rd_server_1b: - rd_server_1b - disk.read.bytes @@ -232,18 +241,6 @@ topology_template: disk.ephemeral.size_rd_server_1b: - rd_server_1b - disk.ephemeral.size - network.incoming.packets_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.incoming.packets - feature_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - feature - network.outpoing.packets_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.outpoing.packets - network.incoming.bytes.rate_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.incoming.bytes.rate disk.latency_rd_server_1b: - rd_server_1b - disk.latency @@ -259,6 +256,9 @@ topology_template: cpu_rd_server_1b: - rd_server_1b - cpu + network.incoming.bytes.rate_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.incoming.bytes.rate cpu.delta_rd_server_1b: - rd_server_1b - cpu.delta @@ -271,31 +271,31 @@ topology_template: disk.allocation_rd_server_1b: - rd_server_1b - disk.allocation - network.outgoing.bytes.rate_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - network.outgoing.bytes.rate + attachment_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - attachment disk.iops_rd_server_1b: - rd_server_1b - disk.iops + network.outgoing.bytes.rate_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate endpoint_rd_server_1b: - rd_server_1b - endpoint - binding_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - binding memory.usage_rd_server_1b: - rd_server_1b - memory.usage requirements: - link_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port - - link dependency_rd_server_1b: - rd_server_1b - dependency local_storage_rd_server_1b: - rd_server_1b - local_storage - dependency_rd_server_1b_ps_server_b_port: - - rd_server_1b_ps_server_b_port + dependency_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_1b_port - dependency + link_rd_server_1b_ps_server_1b_port: + - rd_server_1b_ps_server_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/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml index 6edd5eb6e4..19f9133272 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml @@ -135,28 +135,28 @@ topology_template: - 0 vm_flavor_name: get_input: pd_server_1b_flavor - port_pd_server_b_port_mac_requirements: + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_replacement_policy: + - AUTO + port_pd_server_1b_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_b_port_ip_requirements: + port_pd_server_1b_port_network: + - get_input: net + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_b_port_network: - - get_input: net - port_pd_server_b_port_replacement_policy: - - AUTO - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 1 @@ -251,28 +251,28 @@ topology_template: - get_input: - pd_server_1b_names - 1 - port_ps_server_b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_mac_requirements: + mac_count_required: is_required: false - port_ps_server_b_port_replacement_policy: - - AUTO - port_ps_server_b_port_fixed_ips: + port_ps_server_1b_port_fixed_ips: - ip_address: get_input: - ps_server_1b_ips - 0 vm_flavor_name: get_input: pd_server_1b_flavor - port_ps_server_b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_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_1b_image - port_ps_server_b_port_network: - - get_input: net + port_ps_server_1b_port_replacement_policy: + - AUTO compute_pd_server_1b_availability_zone: - get_input: availability_zone_0 service_template_filter: @@ -465,7 +465,7 @@ topology_template: - disk.usage_oam_server_1c2 network.incoming.bytes_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.incoming.bytes_pd_server_1b_pd_server_b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port feature_server_1c1_cmaui_2: - abstract_cmaui_1c1 - feature_cmaui_1c1 @@ -507,10 +507,10 @@ topology_template: - feature_server_pd network.incoming.packets_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.incoming.packets_pd_server_1b_pd_server_b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port attachment_ps_server_1b_port: - abstract_pd_server_1b - - attachment_pd_server_1b_ps_server_b_port + - attachment_pd_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.requests.rate_oam_server_1c2 @@ -723,7 +723,7 @@ topology_template: - feature_cmaui_1c1_cmaui_port network.incoming.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port network.outgoing.bytes_oam_port_2: - abstract_oam_server_1c2_1 - network.outgoing.bytes_oam_server_1c2_oam_port @@ -798,7 +798,7 @@ topology_template: - host_pd_server_1b network.outgoing.packets.rate_ps_server_1b_port: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_ps_server_b_port + - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port disk.root.size_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.root.size_pd_server_1b @@ -816,19 +816,19 @@ topology_template: - disk.device.usage_cmaui_1c1 network.incoming.bytes_ps_server_1b_port: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_ps_server_b_port + - network.incoming.bytes_pd_server_1b_ps_server_1b_port host_server_1b_pd_2: - abstract_pd_server_1b - host_pd_server_1b attachment_pd_server_1b_port: - abstract_pd_server_1b_1 - - attachment_pd_server_1b_pd_server_b_port + - attachment_pd_server_1b_pd_server_1b_port vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 binding_ps_server_1b_port: - abstract_pd_server_1b - - binding_pd_server_1b_ps_server_b_port + - binding_pd_server_1b_ps_server_1b_port disk.device.latency_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.latency_oam_server_1c2 @@ -870,7 +870,7 @@ topology_template: - disk.write.requests_pd_server_1b binding_pd_server_1b_port: - abstract_pd_server_1b_1 - - binding_pd_server_1b_pd_server_b_port + - binding_pd_server_1b_pd_server_1b_port disk.device.read.requests.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.requests.rate_pd_server_1b @@ -960,7 +960,7 @@ topology_template: - memory.usage_pd_server_1b network.outpoing.packets_ps_server_1b_port: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_ps_server_b_port + - network.outpoing.packets_pd_server_1b_ps_server_1b_port memory.usage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory.usage_oam_server_1c2 @@ -999,7 +999,7 @@ topology_template: - disk.device.write.requests_pd_server_1b network.incoming.bytes.rate_ps_server_1b_port: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_ps_server_b_port + - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port cpu_util_server_pd_nested1_pattern_4: - nested1_pattern_4 - cpu_util_server_pd @@ -1047,7 +1047,7 @@ topology_template: - binding_cmaui_1c1 feature_ps_server_1b_port: - abstract_pd_server_1b - - feature_pd_server_1b_ps_server_b_port + - feature_pd_server_1b_ps_server_1b_port disk.device.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.iops_oam_server_1c2 @@ -1074,7 +1074,7 @@ topology_template: - disk.device.read.bytes.rate_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port disk.write.requests.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.write.requests.rate_pd_server_1b @@ -1170,7 +1170,7 @@ topology_template: - cpu_util_pd_server_1b network.outgoing.bytes.rate_ps_server_1b_port: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_ps_server_b_port + - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port disk.write.requests_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.requests_server_pd @@ -1179,7 +1179,7 @@ topology_template: - feature_pd_server_1b network.incoming.packets.rate_ps_server_1b_port: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_ps_server_b_port + - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests.rate_cmaui_1c1 @@ -1242,7 +1242,7 @@ topology_template: - disk.iops_pd_server_1b network.outpoing.packets_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.outpoing.packets_pd_server_1b_pd_server_b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port disk.device.read.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.requests_cmaui_1c1 @@ -1266,7 +1266,7 @@ topology_template: - disk.device.allocation_oam_server_1c2 network.outgoing.bytes_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.outgoing.bytes_pd_server_1b_pd_server_b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port disk.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.requests_cmaui_1c1 @@ -1422,13 +1422,13 @@ topology_template: - disk.device.read.requests.rate_cmaui_1c1 network.incoming.packets_ps_server_1b_port: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_ps_server_b_port + - network.incoming.packets_pd_server_1b_ps_server_1b_port instance_server_pd_nested1_pattern_4: - nested1_pattern_4 - instance_server_pd feature_pd_server_1b_port: - abstract_pd_server_1b_1 - - feature_pd_server_1b_pd_server_b_port + - feature_pd_server_1b_pd_server_1b_port disk.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.latency_cmaui_1c1 @@ -1467,7 +1467,7 @@ topology_template: - disk.write.bytes_cmaui_1c1 network.outgoing.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 @@ -1485,7 +1485,7 @@ topology_template: - disk.device.latency_pd_server_1b network.incoming.packets.rate_pd_server_1b_port: - abstract_pd_server_1b_1 - - network.incoming.packets.rate_pd_server_1b_pd_server_b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port feature_nested1_pattern_4: - nested1_pattern_4 - feature @@ -1542,7 +1542,7 @@ topology_template: - network.incoming.bytes.rate_cmaui_1c1_cmaui_port network.outgoing.bytes_ps_server_1b_port: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_ps_server_b_port + - network.outgoing.bytes_pd_server_1b_ps_server_1b_port network.incoming.bytes.rate_cmaui_port_2: - abstract_cmaui_1c1 - network.incoming.bytes.rate_cmaui_1c1_cmaui_port @@ -1582,7 +1582,7 @@ topology_template: requirements: link_pd_server_1b_port: - abstract_pd_server_1b_1 - - link_pd_server_1b_pd_server_b_port + - link_pd_server_1b_pd_server_1b_port dependency_oam_port_2: - abstract_oam_server_1c2_1 - dependency_oam_server_1c2_oam_port @@ -1597,10 +1597,10 @@ topology_template: - link_pd_server_port_2 link_ps_server_1b_port: - abstract_pd_server_1b - - link_pd_server_1b_ps_server_b_port + - link_pd_server_1b_ps_server_1b_port dependency_ps_server_1b_port: - abstract_pd_server_1b - - dependency_pd_server_1b_ps_server_b_port + - dependency_pd_server_1b_ps_server_1b_port dependency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - dependency_oam_server_1c2 @@ -1648,7 +1648,7 @@ topology_template: - dependency_cmaui_1c1 dependency_pd_server_1b_port: - abstract_pd_server_1b_1 - - dependency_pd_server_1b_pd_server_b_port + - dependency_pd_server_1b_pd_server_1b_port dependency_packet_internal_network: - packet_internal_network - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index ef3fc1ac7f..9c1f678489 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -435,10 +435,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_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 @@ -451,17 +447,13 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_network_role_tag: type: string required: true status: SUPPORTED @@ -469,27 +461,27 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_b_port_ip_requirements: + port_pd_server_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_b_port_network: - type: list + type: string + port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd_server_b_port_network_role_tag: + port_pd_server_1b_port_network_role: type: string required: true status: SUPPORTED - port_pd_server_b_port_network_role: - type: string + port_pd_server_1b_port_fixed_ips: + type: list required: true status: SUPPORTED - port_pd_server_b_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_network: type: list required: true status: SUPPORTED @@ -501,16 +493,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_b_port_order: + port_pd_server_1b_port_order: type: integer required: true status: SUPPORTED - port_pd_server_b_port_vlan_requirements: + port_pd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - dependency_pd_server_1b: capability: tosca.capabilities.Node @@ -526,14 +526,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_b_port: + - dependency_pd_server_1b_pd_server_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_b_port: + - link_pd_server_1b_pd_server_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -546,6 +546,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -559,37 +564,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_b_port: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port: + cpu.delta_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - cpu.delta_pd_server_1b: + network.incoming.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -612,6 +605,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -647,8 +647,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.Attachment + network.outpoing.packets_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -682,25 +683,30 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port: + disk.latency_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_pd_server_1b: + disk.ephemeral.size_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -735,12 +741,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_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.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -764,6 +764,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -781,19 +787,19 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_pd_server_1b: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_b_port: + memory.resident_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -817,7 +823,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_b_port: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -835,12 +841,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_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.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3003,24 +3003,26 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3029,50 +3031,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true status: SUPPORTED - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true status: SUPPORTED - port_ps_server_b_port_network: + port_ps_server_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_ps_server_1b_availability_zone: type: list required: true @@ -3100,14 +3100,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_b_port: + - dependency_ps_server_1b_ps_server_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_b_port: + - link_ps_server_1b_ps_server_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3167,13 +3167,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_ps_server_1b: + attachment_ps_server_1b_ps_server_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_b_port: + disk.device.capacity_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3209,12 +3214,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_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 host_ps_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -3246,6 +3245,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3270,66 +3275,60 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED binding_ps_server_1b: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_b_port: + memory.resident_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port: + memory_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_ps_server_1b: + disk.write.bytes_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_ps_server_1b: + disk.device.write.bytes.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_ps_server_1b: + disk.read.bytes_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_1b: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outgoing.bytes_ps_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.read.bytes_ps_server_1b: + network.incoming.packets_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_ps_server_b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3345,11 +3344,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_ps_server_b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3368,13 +3362,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_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.incoming.packets_ps_server_1b_ps_server_b_port: + network.outpoing.packets_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3397,19 +3385,24 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_ps_server_1b: + feature_ps_server_1b_ps_server_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + vcpus_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_b_port: + cpu.delta_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3421,6 +3414,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_ps_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED org.openecomp.resource.abstract.nodes.cmaui_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml index 81488c79d9..1dbe52f405 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_pd_server_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 @@ -29,37 +26,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_pd_server_b_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_b_port_network: + port_pd_server_1b_port_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_b_port_network_role_tag: - type: string + port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_server_b_port_network_role: + port_pd_server_1b_port_network_role: type: string required: true - port_pd_server_b_port_replacement_policy: + port_pd_server_1b_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_network: type: list required: true entry_schema: @@ -69,14 +63,20 @@ topology_template: required: true entry_schema: type: string - port_pd_server_b_port_order: + port_pd_server_1b_port_order: type: integer required: true - port_pd_server_b_port_vlan_requirements: + port_pd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_subnetpoolid: + type: string + required: true node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -93,34 +93,34 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_b_port: + pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_server_b_port_exCP_naming + get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - - port_pd_server_b_port_replacement_policy + - port_pd_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_pd_server_b_port_vlan_requirements + get_input: port_pd_server_1b_port_vlan_requirements ip_requirements: - get_input: port_pd_server_b_port_ip_requirements + get_input: port_pd_server_1b_port_ip_requirements network_role_tag: - get_input: port_pd_server_b_port_network_role_tag + get_input: port_pd_server_1b_port_network_role_tag mac_requirements: - get_input: port_pd_server_b_port_mac_requirements + get_input: port_pd_server_1b_port_mac_requirements order: - get_input: port_pd_server_b_port_order + get_input: port_pd_server_1b_port_order network_role: - get_input: port_pd_server_b_port_network_role + get_input: port_pd_server_1b_port_network_role subnetpoolid: - get_input: port_pd_server_b_port_subnetpoolid + get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_b_port_fixed_ips + get_input: port_pd_server_1b_port_fixed_ips network: get_input: - - port_pd_server_b_port_network + - port_pd_server_1b_port_network - index_value requirements: - binding: @@ -133,30 +133,27 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes + feature_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - feature host_pd_server_1b: - pd_server_1b - host disk.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.read.bytes.rate - feature_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - feature disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.bytes.rate - binding_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - binding + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta + network.incoming.bytes_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -166,6 +163,9 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops + binding_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -184,9 +184,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - attachment_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - attachment + network.outpoing.packets_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outpoing.packets memory_pd_server_1b: - pd_server_1b - memory @@ -202,18 +202,21 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage + attachment_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.bytes.rate disk.latency_pd_server_1b: - pd_server_1b - disk.latency disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate scalable_pd_server_1b: - pd_server_1b - scalable @@ -229,9 +232,6 @@ topology_template: disk.iops_pd_server_1b: - pd_server_1b - disk.iops - network.incoming.packets.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.packets.rate disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -244,6 +244,9 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -253,15 +256,15 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util + network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.bytes memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port - network.incoming.packets - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.packets.rate disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate @@ -271,18 +274,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outpoing.packets_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outpoing.packets + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage - network.outgoing.bytes_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.bytes disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -293,9 +293,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + link_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port - link - dependency_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + dependency_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_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/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml index 6d0f966e57..c97cb23644 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,21 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + port_ps_server_1b_port_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,40 +34,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_b_port_network_role: - type: string - required: true - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true - port_ps_server_b_port_network: + port_ps_server_1b_port_replacement_policy: type: list required: true entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true compute_ps_server_1b_availability_zone: type: list required: true @@ -93,34 +93,34 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_b_port: + ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps_server_b_port_exCP_naming + get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - - port_ps_server_b_port_replacement_policy + - port_ps_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_ps_server_b_port_vlan_requirements + get_input: port_ps_server_1b_port_vlan_requirements ip_requirements: - get_input: port_ps_server_b_port_ip_requirements + get_input: port_ps_server_1b_port_ip_requirements network_role_tag: - get_input: port_ps_server_b_port_network_role_tag + get_input: port_ps_server_1b_port_network_role_tag mac_requirements: - get_input: port_ps_server_b_port_mac_requirements + get_input: port_ps_server_1b_port_mac_requirements order: - get_input: port_ps_server_b_port_order + get_input: port_ps_server_1b_port_order network_role: - get_input: port_ps_server_b_port_network_role + get_input: port_ps_server_1b_port_network_role subnetpoolid: - get_input: port_ps_server_b_port_subnetpoolid + get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_b_port_fixed_ips + get_input: port_ps_server_1b_port_fixed_ips network: get_input: - - port_ps_server_b_port_network + - port_ps_server_1b_port_network - index_value requirements: - binding: @@ -157,12 +157,15 @@ topology_template: disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops + attachment_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - network.incoming.packets.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.packets.rate instance_ps_server_1b: - ps_server_1b - instance @@ -178,9 +181,6 @@ topology_template: disk.device.read.requests_ps_server_1b: - ps_server_1b - disk.device.read.requests - network.incoming.bytes.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.bytes.rate host_ps_server_1b: - ps_server_1b - host @@ -196,6 +196,9 @@ topology_template: disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity + network.incoming.bytes_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b - disk.write.requests.rate @@ -208,18 +211,9 @@ topology_template: disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size - feature_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - feature binding_ps_server_1b: - ps_server_1b - binding - network.incoming.bytes_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.bytes - network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.outgoing.bytes.rate memory.resident_ps_server_1b: - ps_server_1b - memory.resident @@ -232,24 +226,27 @@ topology_template: disk.device.write.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.write.bytes.rate - binding_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - binding disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.outgoing.bytes_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate + network.outgoing.bytes_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port - network.outgoing.bytes + network.incoming.packets_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.packets + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b - feature os_ps_server_1b: - ps_server_1b - os - attachment_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - attachment disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -259,12 +256,9 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outgoing.packets.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.outgoing.packets.rate - network.incoming.packets_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.packets + network.outpoing.packets_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.outpoing.packets memory.usage_ps_server_1b: - ps_server_1b - memory.usage @@ -274,27 +268,33 @@ topology_template: endpoint_ps_server_1b: - ps_server_1b - endpoint + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate + feature_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - feature vcpus_ps_server_1b: - ps_server_1b - vcpus cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta - network.outpoing.packets_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.outpoing.packets disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size + binding_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - binding requirements: local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port + dependency_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port - dependency - link_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port + link_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port - link dependency_ps_server_1b: - ps_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml index ae05dd420d..e214d825ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml @@ -185,28 +185,28 @@ topology_template: - 0 vm_flavor_name: get_input: pd_server_1b_flavor - port_pd_server_b_port_mac_requirements: + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_replacement_policy: + - AUTO + port_pd_server_1b_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_b_port_ip_requirements: + port_pd_server_1b_port_network: + - get_input: net + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_b_port_network: - - get_input: net - port_pd_server_b_port_replacement_policy: - - AUTO - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -220,28 +220,28 @@ topology_template: directives: - substitutable properties: - port_ps_server_b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_mac_requirements: + mac_count_required: is_required: false - port_ps_server_b_port_replacement_policy: - - AUTO - port_ps_server_b_port_fixed_ips: + port_ps_server_1b_port_fixed_ips: - ip_address: get_input: - ps_server_1b_ips - 0 vm_flavor_name: get_input: ps_server_1b_flavor - port_ps_server_b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_b_port_network: - - get_input: net + port_ps_server_1b_port_replacement_policy: + - AUTO compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -413,7 +413,7 @@ topology_template: - disk.usage_oam_server_1c2 network.incoming.bytes_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port feature_server_1c1_cmaui_2: - abstract_cmaui_1c1 - feature_cmaui_1c1 @@ -443,10 +443,10 @@ topology_template: - disk.device.iops_pd_server_1b network.incoming.packets_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port attachment_ps_server_1b_port: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_b_port + - attachment_ps_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.requests.rate_oam_server_1c2 @@ -605,7 +605,7 @@ topology_template: - feature_cmaui_1c1_cmaui_port network.incoming.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port network.outgoing.bytes_oam_port_2: - abstract_oam_server_1c2_1 - network.outgoing.bytes_oam_server_1c2_oam_port @@ -671,7 +671,7 @@ topology_template: - endpoint_cmaui_1c1 network.outgoing.packets.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port endpoint_server_1c1_cmaui_1: - abstract_cmaui_1c1 - endpoint_cmaui_1c1 @@ -686,16 +686,16 @@ topology_template: - disk.device.usage_cmaui_1c1 network.incoming.bytes_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port attachment_pd_server_1b_port: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_b_port + - attachment_pd_server_1b_pd_server_1b_port vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 binding_ps_server_1b_port: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_b_port + - binding_ps_server_1b_ps_server_1b_port disk.device.write.bytes.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes.rate_ps_server_1b @@ -740,7 +740,7 @@ topology_template: - disk.device.read.requests_ps_server_1b binding_pd_server_1b_port: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_b_port + - binding_pd_server_1b_pd_server_1b_port disk.read.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.read.bytes_oam_server_1c2 @@ -806,7 +806,7 @@ topology_template: - memory.usage_oam_server_1c2 network.outpoing.packets_ps_server_1b_port: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port memory.usage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory.usage_oam_server_1c2 @@ -836,7 +836,7 @@ topology_template: - memory.resident_cmaui_1c1 network.incoming.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port network.incoming.bytes.rate_oam_port_1: - abstract_oam_server_1c2_0 - network.incoming.bytes.rate_oam_server_1c2_oam_port @@ -878,7 +878,7 @@ topology_template: - binding_cmaui_1c1 feature_ps_server_1b_port: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_b_port + - feature_ps_server_1b_ps_server_1b_port disk.device.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.iops_oam_server_1c2 @@ -905,7 +905,7 @@ topology_template: - attachment network.outgoing.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port memory_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory_cmaui_1c1 @@ -974,10 +974,10 @@ topology_template: - network.incoming.packets_cmaui_1c1_cmaui_port network.outgoing.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port network.incoming.packets.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests.rate_cmaui_1c1 @@ -1040,7 +1040,7 @@ topology_template: - end_point network.outpoing.packets_pd_server_1b_port: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port feature_server_1b_pd: - abstract_pd_server_1b - feature_pd_server_1b @@ -1067,7 +1067,7 @@ topology_template: - disk.device.allocation_oam_server_1c2 network.outgoing.bytes_pd_server_1b_port: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port disk.write.bytes_server_1b_pd: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -1205,13 +1205,13 @@ topology_template: - disk.device.read.requests.rate_cmaui_1c1 network.incoming.packets_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port disk.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.write.requests_ps_server_1b feature_pd_server_1b_port: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_b_port + - feature_pd_server_1b_pd_server_1b_port disk.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.latency_cmaui_1c1 @@ -1244,7 +1244,7 @@ topology_template: - disk.write.bytes_cmaui_1c1 network.outgoing.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 @@ -1256,7 +1256,7 @@ topology_template: - feature_oam_server_1c2_oam_port network.incoming.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port disk.device.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.latency_cmaui_1c1 @@ -1298,7 +1298,7 @@ topology_template: - network.incoming.bytes.rate_cmaui_1c1_cmaui_port network.outgoing.bytes_ps_server_1b_port: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes.rate_cmaui_port_2: - abstract_cmaui_1c1 - network.incoming.bytes.rate_cmaui_1c1_cmaui_port @@ -1341,7 +1341,7 @@ topology_template: - dependency_pd_server_1b link_pd_server_1b_port: - abstract_pd_server_1b - - link_pd_server_1b_pd_server_b_port + - link_pd_server_1b_pd_server_1b_port local_storage_server_1b_ps: - abstract_ps_server_1b - local_storage_ps_server_1b @@ -1359,13 +1359,13 @@ topology_template: - dependency_cmaui_1c1 link_ps_server_1b_port: - abstract_ps_server_1b - - link_ps_server_1b_ps_server_b_port + - link_ps_server_1b_ps_server_1b_port local_storage_server_1b_pd: - abstract_pd_server_1b - local_storage_pd_server_1b dependency_ps_server_1b_port: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_b_port + - dependency_ps_server_1b_ps_server_1b_port dependency_server_1b_ps: - abstract_ps_server_1b - dependency_ps_server_1b @@ -1383,7 +1383,7 @@ topology_template: - local_storage_oam_server_1c2 dependency_pd_server_1b_port: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_b_port + - dependency_pd_server_1b_pd_server_1b_port dependency_cmaui_port_1: - abstract_cmaui_1c1 - dependency_cmaui_1c1_cmaui_port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index d8db407d94..391a1b781c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -985,10 +985,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_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 @@ -1001,17 +997,13 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_network_role_tag: type: string required: true status: SUPPORTED @@ -1019,27 +1011,27 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_b_port_ip_requirements: + port_pd_server_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_b_port_network: - type: list + type: string + port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd_server_b_port_network_role_tag: + port_pd_server_1b_port_network_role: type: string required: true status: SUPPORTED - port_pd_server_b_port_network_role: - type: string + port_pd_server_1b_port_fixed_ips: + type: list required: true status: SUPPORTED - port_pd_server_b_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_network: type: list required: true status: SUPPORTED @@ -1051,16 +1043,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_server_b_port_order: + port_pd_server_1b_port_order: type: integer required: true status: SUPPORTED - port_pd_server_b_port_vlan_requirements: + port_pd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - dependency_pd_server_1b: capability: tosca.capabilities.Node @@ -1076,14 +1076,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_b_port: + - dependency_pd_server_1b_pd_server_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_b_port: + - link_pd_server_1b_pd_server_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1096,6 +1096,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1109,37 +1114,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_b_port: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port: + cpu.delta_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - cpu.delta_pd_server_1b: + network.incoming.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1162,6 +1155,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1197,8 +1197,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_b_port: - type: tosca.capabilities.Attachment + network.outpoing.packets_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1232,25 +1233,30 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_1b_pd_server_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port: + disk.latency_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_pd_server_1b: + disk.ephemeral.size_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1285,12 +1291,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_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.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1314,6 +1314,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1331,19 +1337,19 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_pd_server_1b: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_b_port: + memory.resident_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1367,7 +1373,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_b_port: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1385,12 +1391,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_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.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3833,24 +3833,26 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3859,50 +3861,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true status: SUPPORTED - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true status: SUPPORTED - port_ps_server_b_port_network: + port_ps_server_1b_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_ps_server_1b_availability_zone: type: list required: true @@ -3930,14 +3930,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_b_port: + - dependency_ps_server_1b_ps_server_1b_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_b_port: + - link_ps_server_1b_ps_server_1b_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3997,13 +3997,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_ps_server_1b: + attachment_ps_server_1b_ps_server_1b_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_b_port: + disk.device.capacity_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4039,12 +4044,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_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 host_ps_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -4076,6 +4075,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4100,66 +4105,60 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED binding_ps_server_1b: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_b_port: + memory.resident_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port: + memory_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_ps_server_1b: + disk.write.bytes_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_ps_server_1b: + disk.device.write.bytes.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_ps_server_1b: + disk.read.bytes_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_1b: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outgoing.bytes_ps_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.read.bytes_ps_server_1b: + network.incoming.packets_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_ps_server_b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4175,11 +4174,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_ps_server_b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4198,13 +4192,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_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.incoming.packets_ps_server_1b_ps_server_b_port: + network.outpoing.packets_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4227,19 +4215,24 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_ps_server_1b: + feature_ps_server_1b_ps_server_1b_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + vcpus_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_b_port: + cpu.delta_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4251,6 +4244,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_ps_server_1b_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED org.openecomp.resource.abstract.nodes.cmaui_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml index 81488c79d9..1dbe52f405 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_pd_server_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 @@ -29,37 +26,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_pd_server_b_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_b_port_network: + port_pd_server_1b_port_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_b_port_network_role_tag: - type: string + port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_server_b_port_network_role: + port_pd_server_1b_port_network_role: type: string required: true - port_pd_server_b_port_replacement_policy: + port_pd_server_1b_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_network: type: list required: true entry_schema: @@ -69,14 +63,20 @@ topology_template: required: true entry_schema: type: string - port_pd_server_b_port_order: + port_pd_server_1b_port_order: type: integer required: true - port_pd_server_b_port_vlan_requirements: + port_pd_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_subnetpoolid: + type: string + required: true node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -93,34 +93,34 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_b_port: + pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_server_b_port_exCP_naming + get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - - port_pd_server_b_port_replacement_policy + - port_pd_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_pd_server_b_port_vlan_requirements + get_input: port_pd_server_1b_port_vlan_requirements ip_requirements: - get_input: port_pd_server_b_port_ip_requirements + get_input: port_pd_server_1b_port_ip_requirements network_role_tag: - get_input: port_pd_server_b_port_network_role_tag + get_input: port_pd_server_1b_port_network_role_tag mac_requirements: - get_input: port_pd_server_b_port_mac_requirements + get_input: port_pd_server_1b_port_mac_requirements order: - get_input: port_pd_server_b_port_order + get_input: port_pd_server_1b_port_order network_role: - get_input: port_pd_server_b_port_network_role + get_input: port_pd_server_1b_port_network_role subnetpoolid: - get_input: port_pd_server_b_port_subnetpoolid + get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: - get_input: port_pd_server_b_port_fixed_ips + get_input: port_pd_server_1b_port_fixed_ips network: get_input: - - port_pd_server_b_port_network + - port_pd_server_1b_port_network - index_value requirements: - binding: @@ -133,30 +133,27 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes + feature_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - feature host_pd_server_1b: - pd_server_1b - host disk.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.read.bytes.rate - feature_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - feature disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.bytes.rate - binding_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - binding + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta + network.incoming.bytes_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -166,6 +163,9 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops + binding_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -184,9 +184,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - attachment_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - attachment + network.outpoing.packets_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outpoing.packets memory_pd_server_1b: - pd_server_1b - memory @@ -202,18 +202,21 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage + attachment_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.bytes.rate disk.latency_pd_server_1b: - pd_server_1b - disk.latency disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate scalable_pd_server_1b: - pd_server_1b - scalable @@ -229,9 +232,6 @@ topology_template: disk.iops_pd_server_1b: - pd_server_1b - disk.iops - network.incoming.packets.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.incoming.packets.rate disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -244,6 +244,9 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -253,15 +256,15 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util + network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.bytes memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port - network.incoming.packets - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.packets.rate disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate @@ -271,18 +274,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outpoing.packets_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outpoing.packets + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage - network.outgoing.bytes_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port - - network.outgoing.bytes disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -293,9 +293,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + link_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port - link - dependency_pd_server_1b_pd_server_b_port: - - pd_server_1b_pd_server_b_port + dependency_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_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/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml index 6d0f966e57..c97cb23644 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,21 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_b_port_vlan_requirements: + port_ps_server_1b_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_b_port_ip_requirements: - type: list + port_ps_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_b_port_replacement_policy: + port_ps_server_1b_port_network_role_tag: + type: string + required: true + port_ps_server_1b_port_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,40 +34,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_b_port_network_role: - type: string - required: true - port_ps_server_b_port_fixed_ips: - type: list + port_ps_server_1b_port_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_ps_server_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_network: + type: list required: true - port_ps_server_b_port_subnetpoolid: - type: string + entry_schema: + type: string + port_ps_server_1b_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps_server_b_port_order: - type: integer + port_ps_server_1b_port_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_ps_server_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_ps_server_b_port_network_role_tag: + port_ps_server_1b_port_network_role: type: string required: true - port_ps_server_b_port_network: + port_ps_server_1b_port_replacement_policy: type: list required: true entry_schema: type: string + port_ps_server_1b_port_subnetpoolid: + type: string + required: true compute_ps_server_1b_availability_zone: type: list required: true @@ -93,34 +93,34 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_b_port: + ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps_server_b_port_exCP_naming + get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - - port_ps_server_b_port_replacement_policy + - port_ps_server_1b_port_replacement_policy - index_value vlan_requirements: - get_input: port_ps_server_b_port_vlan_requirements + get_input: port_ps_server_1b_port_vlan_requirements ip_requirements: - get_input: port_ps_server_b_port_ip_requirements + get_input: port_ps_server_1b_port_ip_requirements network_role_tag: - get_input: port_ps_server_b_port_network_role_tag + get_input: port_ps_server_1b_port_network_role_tag mac_requirements: - get_input: port_ps_server_b_port_mac_requirements + get_input: port_ps_server_1b_port_mac_requirements order: - get_input: port_ps_server_b_port_order + get_input: port_ps_server_1b_port_order network_role: - get_input: port_ps_server_b_port_network_role + get_input: port_ps_server_1b_port_network_role subnetpoolid: - get_input: port_ps_server_b_port_subnetpoolid + get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: - get_input: port_ps_server_b_port_fixed_ips + get_input: port_ps_server_1b_port_fixed_ips network: get_input: - - port_ps_server_b_port_network + - port_ps_server_1b_port_network - index_value requirements: - binding: @@ -157,12 +157,15 @@ topology_template: disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops + attachment_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - network.incoming.packets.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.packets.rate instance_ps_server_1b: - ps_server_1b - instance @@ -178,9 +181,6 @@ topology_template: disk.device.read.requests_ps_server_1b: - ps_server_1b - disk.device.read.requests - network.incoming.bytes.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.bytes.rate host_ps_server_1b: - ps_server_1b - host @@ -196,6 +196,9 @@ topology_template: disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity + network.incoming.bytes_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b - disk.write.requests.rate @@ -208,18 +211,9 @@ topology_template: disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size - feature_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - feature binding_ps_server_1b: - ps_server_1b - binding - network.incoming.bytes_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.bytes - network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.outgoing.bytes.rate memory.resident_ps_server_1b: - ps_server_1b - memory.resident @@ -232,24 +226,27 @@ topology_template: disk.device.write.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.write.bytes.rate - binding_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - binding disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.outgoing.bytes_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate + network.outgoing.bytes_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port - network.outgoing.bytes + network.incoming.packets_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.packets + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b - feature os_ps_server_1b: - ps_server_1b - os - attachment_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - attachment disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -259,12 +256,9 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outgoing.packets.rate_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.outgoing.packets.rate - network.incoming.packets_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.incoming.packets + network.outpoing.packets_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.outpoing.packets memory.usage_ps_server_1b: - ps_server_1b - memory.usage @@ -274,27 +268,33 @@ topology_template: endpoint_ps_server_1b: - ps_server_1b - endpoint + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate + feature_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - feature vcpus_ps_server_1b: - ps_server_1b - vcpus cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta - network.outpoing.packets_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port - - network.outpoing.packets disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size + binding_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - binding requirements: local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port + dependency_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port - dependency - link_ps_server_1b_ps_server_b_port: - - ps_server_1b_ps_server_b_port + link_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port - link dependency_ps_server_1b: - ps_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml index cb7fdc359a..a3bf3f973a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml @@ -185,28 +185,28 @@ topology_template: - 0 vm_flavor_name: get_input: pd_server_1b_flavor - port_pd_server_b_port_mac_requirements: + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_replacement_policy: + - AUTO + port_pd_server_1b_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_b_port_fixed_ips: + port_pd_server_1b_port_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_b_port_ip_requirements: + port_pd_server_1b_port_network: + - get_input: net + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_b_port_network: - - get_input: net - port_pd_server_b_port_replacement_policy: - - AUTO - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -220,28 +220,28 @@ topology_template: directives: - substitutable properties: - port_ps_server_b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_mac_requirements: + mac_count_required: is_required: false - port_ps_server_b_port_replacement_policy: - - AUTO - port_ps_server_b_port_fixed_ips: + port_ps_server_1b_port_fixed_ips: - ip_address: get_input: - ps_server_1b_ips - 0 vm_flavor_name: get_input: ps_server_1b_flavor - port_ps_server_b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_b_port_network: - - get_input: net + port_ps_server_1b_port_replacement_policy: + - AUTO compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -420,7 +420,7 @@ topology_template: - disk.usage_oam_server_1c2 network.incoming.bytes_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port feature_server_1c1_cmaui_2: - abstract_cmaui_1c1 - feature_cmaui_1c1 @@ -450,10 +450,10 @@ topology_template: - disk.device.iops_pd_server_1b network.incoming.packets_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port attachment_ps_server_1b_port: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_b_port + - attachment_ps_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.requests.rate_oam_server_1c2 @@ -612,7 +612,7 @@ topology_template: - feature_cmaui_1c1_cmaui_port network.incoming.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port network.outgoing.bytes_oam_port_2: - abstract_oam_server_1c2_1 - network.outgoing.bytes_oam_server_1c2_oam_port @@ -678,7 +678,7 @@ topology_template: - endpoint_cmaui_1c1 network.outgoing.packets.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port endpoint_server_1c1_cmaui_1: - abstract_cmaui_1c1 - endpoint_cmaui_1c1 @@ -693,16 +693,16 @@ topology_template: - disk.device.usage_cmaui_1c1 network.incoming.bytes_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port attachment_pd_server_1b_port: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_b_port + - attachment_pd_server_1b_pd_server_1b_port vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 binding_ps_server_1b_port: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_b_port + - binding_ps_server_1b_ps_server_1b_port disk.device.write.bytes.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes.rate_ps_server_1b @@ -747,7 +747,7 @@ topology_template: - disk.device.read.requests_ps_server_1b binding_pd_server_1b_port: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_b_port + - binding_pd_server_1b_pd_server_1b_port disk.read.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.read.bytes_oam_server_1c2 @@ -813,7 +813,7 @@ topology_template: - memory.usage_oam_server_1c2 network.outpoing.packets_ps_server_1b_port: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port memory.usage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory.usage_oam_server_1c2 @@ -843,7 +843,7 @@ topology_template: - memory.resident_cmaui_1c1 network.incoming.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port network.incoming.bytes.rate_oam_port_1: - abstract_oam_server_1c2_0 - network.incoming.bytes.rate_oam_server_1c2_oam_port @@ -885,7 +885,7 @@ topology_template: - binding_cmaui_1c1 feature_ps_server_1b_port: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_b_port + - feature_ps_server_1b_ps_server_1b_port disk.device.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.iops_oam_server_1c2 @@ -912,7 +912,7 @@ topology_template: - attachment network.outgoing.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port memory_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory_cmaui_1c1 @@ -981,10 +981,10 @@ topology_template: - network.incoming.packets_cmaui_1c1_cmaui_port network.outgoing.bytes.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port network.incoming.packets.rate_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests.rate_cmaui_1c1 @@ -1047,7 +1047,7 @@ topology_template: - end_point network.outpoing.packets_pd_server_1b_port: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port feature_server_1b_pd: - abstract_pd_server_1b - feature_pd_server_1b @@ -1074,7 +1074,7 @@ topology_template: - disk.device.allocation_oam_server_1c2 network.outgoing.bytes_pd_server_1b_port: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port disk.write.bytes_server_1b_pd: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -1212,13 +1212,13 @@ topology_template: - disk.device.read.requests.rate_cmaui_1c1 network.incoming.packets_ps_server_1b_port: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port disk.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.write.requests_ps_server_1b feature_pd_server_1b_port: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_b_port + - feature_pd_server_1b_pd_server_1b_port disk.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.latency_cmaui_1c1 @@ -1251,7 +1251,7 @@ topology_template: - disk.write.bytes_cmaui_1c1 network.outgoing.bytes.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 @@ -1263,7 +1263,7 @@ topology_template: - feature_oam_server_1c2_oam_port network.incoming.packets.rate_pd_server_1b_port: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port disk.device.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.latency_cmaui_1c1 @@ -1305,7 +1305,7 @@ topology_template: - network.incoming.bytes.rate_cmaui_1c1_cmaui_port network.outgoing.bytes_ps_server_1b_port: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes.rate_cmaui_port_2: - abstract_cmaui_1c1 - network.incoming.bytes.rate_cmaui_1c1_cmaui_port @@ -1348,7 +1348,7 @@ topology_template: - dependency_pd_server_1b link_pd_server_1b_port: - abstract_pd_server_1b - - link_pd_server_1b_pd_server_b_port + - link_pd_server_1b_pd_server_1b_port local_storage_server_1b_ps: - abstract_ps_server_1b - local_storage_ps_server_1b @@ -1366,13 +1366,13 @@ topology_template: - dependency_cmaui_1c1 link_ps_server_1b_port: - abstract_ps_server_1b - - link_ps_server_1b_ps_server_b_port + - link_ps_server_1b_ps_server_1b_port local_storage_server_1b_pd: - abstract_pd_server_1b - local_storage_pd_server_1b dependency_ps_server_1b_port: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_b_port + - dependency_ps_server_1b_ps_server_1b_port dependency_server_1b_ps: - abstract_ps_server_1b - dependency_ps_server_1b @@ -1390,7 +1390,7 @@ topology_template: - local_storage_oam_server_1c2 dependency_pd_server_1b_port: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_b_port + - dependency_pd_server_1b_pd_server_1b_port dependency_cmaui_port_1: - abstract_cmaui_1c1 - dependency_cmaui_1c1_cmaui_port |