diff options
author | 2018-11-29 20:46:49 +0530 | |
---|---|---|
committer | 2018-12-02 09:47:45 +0000 | |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B')
13 files changed, 1584 insertions, 1584 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index e00b9d0529..e7bcdefd3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +34,62 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -105,20 +105,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -159,6 +167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -189,15 +203,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd02_port: + network.outpoing.packets_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -221,29 +227,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pd02_port: + feature_pd_server_pd02_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -267,11 +255,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -290,12 +273,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -318,7 +295,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -330,6 +307,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -354,6 +343,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -373,36 +368,42 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server: + network.incoming.bytes.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_pd_server: + disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: + disk.ephemeral.size_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -426,15 +427,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.ps_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -443,17 +455,11 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -463,16 +469,24 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd01_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_pd01_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED vm_image_name: type: string required: true @@ -483,52 +497,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: - type: list + type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + compute_ps_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_ps_name: + port_pd01_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string requirements: - dependency_ps: capability: tosca.capabilities.Node @@ -544,14 +544,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_pd01_port: + - dependency_ps_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_pd01_port: + - link_ps_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -570,12 +570,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED scalable_ps: type: tosca.capabilities.Scalable occurrences: @@ -618,14 +612,14 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -641,23 +635,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_ps_pd01_port: - type: org.openecomp.capabilities.Forwarder + cpu.delta_ps: + type: org.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: + network.incoming.packets_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -680,54 +670,65 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_pd01_port: + disk.device.write.requests.rate_ps: type: org.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_ps: + network.outgoing.bytes_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_ps_pd01_port: - type: tosca.capabilities.Node + cpu_util_ps: + type: org.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_ps_pd01_port: + disk.read.bytes.rate_ps: type: org.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: + disk.device.read.bytes.rate_ps: type: org.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: + forwarder_ps_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps: + vcpus_ps: type: org.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_ps: + network.incoming.packets.rate_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_ps: + attachment_ps_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -745,31 +746,28 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_pd01_port: + disk.device.read.bytes_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_ps: + memory.usage_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_ps: + network.outgoing.bytes.rate_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_ps_pd01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + feature_ps_pd01_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED feature_ps: type: tosca.capabilities.Node @@ -782,12 +780,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -817,12 +809,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_pd01_port: + network.outgoing.packets.rate_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_ps_pd01_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.iops_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -853,7 +853,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_pd01_port: + network.outpoing.packets_ps_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -874,82 +874,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -971,20 +971,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1014,12 +1022,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1031,12 +1033,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1067,7 +1063,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1091,7 +1087,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1109,6 +1117,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1120,17 +1133,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1154,6 +1167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -1165,27 +1184,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1215,6 +1226,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1234,14 +1251,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1263,11 +1274,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1286,12 +1292,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1301,22 +1301,12 @@ node_types: org.openecomp.resource.abstract.nodes.oam: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam02_port_network: + port_oam02_port_2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam02_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam02_port_network_role: - type: string - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1325,90 +1315,87 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam02_port_fixed_ips: + port_oam02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json vm_flavor_name: type: string required: true status: SUPPORTED - port_oam02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam02_port_security_groups: + port_oam02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: json - port_oam02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_oam02_port_2_fixed_ips: + type: list required: true status: SUPPORTED - port_oam02_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_oam02_port_network_role_tag: + port_oam02_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_oam02_port_replacement_policy: + port_oam02_port_2_order: + type: integer + required: true + status: SUPPORTED + port_oam02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam02_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements + port_oam02_port_2_network_role: + type: string + required: true + status: SUPPORTED + port_oam02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED compute_oam_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam02_port_vlan_requirements: - type: list + port_oam02_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_oam02_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_oam_oam02_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_oam_oam02_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_oam: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1423,14 +1410,21 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - cpu_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - dependency_oam_oam02_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_oam_oam02_port: + - link_oam_oam02_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + cpu_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1448,49 +1442,35 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_oam: + network.incoming.bytes.rate_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_oam02_port: + disk.device.write.bytes_oam: type: org.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_oam: + network.outgoing.bytes.rate_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam02_port: + disk.read.bytes_oam: type: org.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_oam_oam02_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED scalable_oam: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam02_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_oam: type: tosca.capabilities.Node occurrences: @@ -1502,6 +1482,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.usage_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1519,6 +1505,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1549,7 +1541,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_oam02_port: + forwarder_oam_oam02_port_2: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -1560,13 +1552,21 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_oam: + network.outgoing.packets.rate_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_oam02_port: + binding_oam_oam02_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + instance_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1578,7 +1578,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam02_port: + attachment_oam_oam02_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1602,6 +1613,17 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_oam02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1674,23 +1696,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_oam02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_oam: type: org.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_oam_oam02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED os_oam: type: tosca.capabilities.OperatingSystem occurrences: @@ -1708,17 +1719,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam02_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_oam_oam02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1740,36 +1740,16 @@ node_types: org.openecomp.resource.abstract.nodes.oam_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_oam01_port_subnetpoolid: + port_oam01_port_1_network_role: type: string required: true status: SUPPORTED - port_oam01_port_order: - type: integer - required: true - status: SUPPORTED - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_oam01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1778,7 +1758,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam01_port_replacement_policy: + port_oam01_port_1_network: type: list required: true status: SUPPORTED @@ -1788,61 +1768,81 @@ node_types: type: string required: true status: SUPPORTED - port_oam01_port_related_networks: + port_oam01_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_oam01_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: + port_oam01_port_1_order: + type: integer + required: true + status: SUPPORTED + port_oam01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_oam01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_oam01_port_1_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_oam_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam01_port_network_role_tag: + port_oam01_port_1_network_role_tag: type: string required: true status: SUPPORTED - compute_oam_name: + port_oam01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam01_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_oam_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string requirements: - - dependency_oam_oam01_port: + - dependency_oam_oam01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam01_port: + - link_oam_oam01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1869,39 +1869,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam01_port: + disk.usage_oam: type: org.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_oam_oam01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outgoing.bytes.rate_oam_oam01_port: + memory.resident_oam: type: org.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_oam: + network.outgoing.bytes.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_oam: + disk.device.write.bytes_oam: type: org.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_oam: + network.incoming.bytes.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1918,17 +1910,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_oam_oam01_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_oam: type: tosca.capabilities.Node occurrences: @@ -1946,12 +1927,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam01_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_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -1987,11 +1962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_oam01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.write.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2010,7 +1980,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam01_port: + attachment_oam_oam01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2022,6 +1997,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_oam_oam01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2040,13 +2021,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_oam: + feature_oam_oam01_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_oam01_port: + disk.device.read.requests.rate_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2082,11 +2068,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_oam01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2105,13 +2086,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam01_port: + disk.device.read.requests_oam: type: org.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_oam: + network.incoming.packets.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2129,6 +2110,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_oam01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED cpu_util_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2152,25 +2139,38 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_oam: + forwarder_oam_oam01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_oam: + disk.write.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_oam: + binding_oam_oam01_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.read.requests_oam: type: org.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_oam_oam01_port: + disk.device.capacity_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2179,34 +2179,36 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui02_port_related_networks: + port_cmaui02_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_cmaui02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui02_port_2_network: + type: list required: true status: SUPPORTED - port_cmaui02_port_fixed_ips: + entry_schema: + type: string + port_cmaui02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_cmaui02_port_2_subnetpoolid: + type: string required: true status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 vm_flavor_name: type: string required: true @@ -2217,71 +2219,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui02_port_vlan_requirements: + port_cmaui02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui02_port_2_network_role: + type: string + required: true + status: SUPPORTED + port_cmaui02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: + port_cmaui02_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui02_port_order: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui02_port_2_order: type: integer required: true status: SUPPORTED - port_cmaui02_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui02_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_cmaui02_port_security_groups: + port_cmaui02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cmaui02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_cmaui02_port_network: + port_cmaui02_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui02_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED requirements: - - dependency_cmaui_cmaui02_port: + - dependency_cmaui_cmaui02_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui02_port: + - link_cmaui_cmaui02_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2302,7 +2302,7 @@ node_types: - 0 - UNBOUNDED capabilities: - network.incoming.bytes_cmaui_cmaui02_port: + network.incoming.bytes_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2326,11 +2326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_cmaui02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.iops_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2362,11 +2357,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_cmaui02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.read.bytes_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2402,6 +2392,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2413,26 +2409,17 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_cmaui02_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_cmaui02_port: + disk.device.read.bytes.rate_cmaui: type: org.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_cmaui_cmaui02_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2451,25 +2438,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests_cmaui: + network.incoming.bytes.rate_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_cmaui: + disk.device.read.requests_cmaui: type: org.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_cmaui: + disk.capacity_cmaui: type: org.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_cmaui_cmaui02_port: + cpu_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2487,12 +2474,42 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_cmaui: type: org.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_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_cmaui02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_cmaui02_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets.rate_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED vcpus_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2504,7 +2521,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_cmaui02_port: + network.outgoing.packets.rate_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2515,11 +2532,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_cmaui02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED endpoint_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -2549,25 +2561,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_cmaui02_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_cmaui: type: org.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_cmaui: + network.outgoing.bytes.rate_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_cmaui02_port: + disk.latency_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2585,7 +2591,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui02_port: + network.outgoing.bytes_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2603,12 +2609,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui02_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_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2618,20 +2618,6 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui01_port_network_role: - type: string - required: true - status: SUPPORTED - port_cmaui01_port_order: - type: integer - required: true - status: SUPPORTED - port_cmaui01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2640,12 +2626,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -2656,71 +2636,91 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui01_port_vlan_requirements: + port_cmaui01_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui01_port_1_order: + type: integer + required: true + status: SUPPORTED compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui01_port_subnetpoolid: - type: string + port_cmaui01_port_1_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_image_name: type: string required: true status: SUPPORTED - port_cmaui01_port_network_role_tag: + port_cmaui01_port_1_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_cmaui01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_cmaui01_port_related_networks: + port_cmaui01_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cmaui01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui01_port_1_security_groups: + type: list required: true status: SUPPORTED - port_cmaui01_port_mac_requirements: + entry_schema: + type: json + port_cmaui01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui01_port_fixed_ips: - type: list + port_cmaui01_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui01_port_network: + port_cmaui01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui01_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cmaui01_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cmaui01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_cmaui_cmaui01_port: + - dependency_cmaui_cmaui01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui01_port: + - link_cmaui_cmaui01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2759,13 +2759,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_cmaui01_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_cmaui_cmaui01_port: + network.incoming.bytes_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2808,19 +2802,20 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_cmaui: + network.outpoing.packets_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_cmaui: - type: tosca.capabilities.Scalable + disk.write.requests_cmaui: + type: org.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_cmaui_cmaui01_port: - type: tosca.capabilities.Node + scalable_cmaui: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -2853,7 +2848,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_cmaui01_port: + network.outgoing.packets.rate_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2865,36 +2860,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_cmaui01_port: + network.outgoing.bytes.rate_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_cmaui_cmaui01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_cmaui01_port: + disk.device.usage_cmaui: type: org.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_cmaui: + disk.iops_cmaui: type: org.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_cmaui: + disk.device.latency_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_cmaui: + network.outgoing.bytes_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2918,42 +2908,49 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui01_port: + disk.read.requests_cmaui: type: org.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_cmaui: + disk.device.read.bytes_cmaui: type: org.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_cmaui_cmaui01_port: - type: tosca.capabilities.Attachment + feature_cmaui_cmaui01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cmaui: + network.incoming.packets_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_cmaui01_port: + disk.device.write.requests_cmaui: type: org.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_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_cmaui01_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui01_port: + binding_cmaui_cmaui01_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets.rate_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2965,14 +2962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_cmaui01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED feature_cmaui: type: tosca.capabilities.Node occurrences: @@ -2983,6 +2972,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_cmaui01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED endpoint_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3006,6 +3001,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_cmaui01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6597,12 +6597,20 @@ node_types: org.openecomp.resource.abstract.nodes.ps: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_pd02_port_2_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_2_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -6611,86 +6619,78 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_2_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: - type: string + entry_schema: + type: string + port_pd02_port_2_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd02_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_2_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_security_groups: + port_pd02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_ps_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_replacement_policy: + type: json + port_pd02_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_image_name: type: string required: true status: SUPPORTED - compute_ps_name: + compute_ps_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: - type: list + port_pd02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + compute_ps_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: - type: list + port_pd02_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_ps: capability: tosca.capabilities.Node @@ -6706,14 +6706,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_pd02_port: + - dependency_ps_pd02_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_pd02_port: + - link_ps_pd02_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6774,12 +6774,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_ps_pd02_port: + network.incoming.bytes.rate_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6790,31 +6785,39 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_ps: + network.outgoing.bytes.rate_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_ps: + disk.device.capacity_ps: type: org.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_pd02_port: + cpu_ps: type: org.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_ps: + network.outgoing.packets.rate_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_pd02_port: + binding_ps_pd02_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6843,13 +6846,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_pd02_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + network.outpoing.packets_ps_pd02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + feature_ps_pd02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 - UNBOUNDED disk.device.write.requests.rate_ps: type: org.openecomp.capabilities.metric.Ceilometer @@ -6857,7 +6863,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_pd02_port: + network.outgoing.bytes_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6869,19 +6875,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_pd02_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_pd02_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_pd02_port: + network.incoming.bytes_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6917,6 +6921,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_pd02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.latency_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6958,11 +6968,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.usage_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6992,11 +6997,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_pd02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7015,7 +7015,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_pd02_port: + network.incoming.packets_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7764,4 +7764,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml index 8fdf0c1e04..d5a5f4c9b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml @@ -133,28 +133,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_0_network: + - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -170,6 +170,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -178,20 +190,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index b7f6826e85..fe904e5a1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -11,11 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui02_port_related_networks: + port_cmaui02_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui02_port_2_network: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_subnetpoolid: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,17 +36,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui02_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true vm_flavor_name: type: string required: true @@ -42,89 +44,87 @@ topology_template: required: true entry_schema: type: string - port_cmaui02_port_vlan_requirements: + port_cmaui02_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui02_port_2_network_role: + type: string + required: true + port_cmaui02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - vm_image_name: + port_cmaui02_port_2_network_role_tag: type: string required: true - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui02_port_order: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui02_port_2_order: type: integer required: true - port_cmaui02_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_cmaui02_port_network_role: + vm_image_name: type: string required: true - port_cmaui02_port_security_groups: + port_cmaui02_port_2_security_groups: type: list required: true entry_schema: type: json - port_cmaui02_port_subnetpoolid: - type: string - required: true - port_cmaui02_port_network: + port_cmaui02_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_cmaui02_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - cmaui_cmaui02_port: + cmaui_cmaui02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui02_port_replacement_policy + - port_cmaui02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_cmaui02_port_mac_requirements + get_input: port_cmaui02_port_2_mac_requirements order: - get_input: port_cmaui02_port_order + get_input: port_cmaui02_port_2_order security_groups: get_input: - - port_cmaui02_port_security_groups + - port_cmaui02_port_2_security_groups - index_value exCP_naming: - get_input: port_cmaui02_port_exCP_naming + get_input: port_cmaui02_port_2_exCP_naming vlan_requirements: - get_input: port_cmaui02_port_vlan_requirements + get_input: port_cmaui02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cmaui02_port_related_networks + get_input: port_cmaui02_port_2_related_networks ip_requirements: - get_input: port_cmaui02_port_ip_requirements + get_input: port_cmaui02_port_2_ip_requirements network_role_tag: - get_input: port_cmaui02_port_network_role_tag + get_input: port_cmaui02_port_2_network_role_tag network_role: - get_input: port_cmaui02_port_network_role + get_input: port_cmaui02_port_2_network_role fixed_ips: get_input: - - port_cmaui02_port_fixed_ips + - port_cmaui02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui02_port_subnetpoolid + get_input: port_cmaui02_port_2_subnetpoolid network: get_input: - - port_cmaui02_port_network + - port_cmaui02_port_2_network - index_value requirements: - binding: @@ -149,8 +149,8 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui capabilities: - network.incoming.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port + network.incoming.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - network.incoming.bytes disk.read.bytes.rate_cmaui: - cmaui @@ -161,9 +161,6 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes - forwarder_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - forwarder disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -179,9 +176,6 @@ topology_template: disk.device.allocation_cmaui: - cmaui - disk.device.allocation - feature_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - feature disk.read.bytes_cmaui: - cmaui - disk.read.bytes @@ -200,21 +194,21 @@ topology_template: disk.root.size_cmaui: - cmaui - disk.root.size + network.outpoing.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outpoing.packets memory.usage_cmaui: - cmaui - memory.usage os_cmaui: - cmaui - os + attachment_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - attachment disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - network.incoming.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets.rate - binding_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - binding disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -224,6 +218,9 @@ topology_template: disk.device.latency_cmaui: - cmaui - disk.device.latency + network.incoming.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.bytes.rate disk.device.read.requests_cmaui: - cmaui - disk.device.read.requests @@ -233,33 +230,42 @@ topology_template: cpu_cmaui: - cmaui - cpu - network.outgoing.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.packets.rate disk.read.requests_cmaui: - cmaui - disk.read.requests disk.device.read.bytes_cmaui: - cmaui - disk.device.read.bytes + forwarder_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - forwarder disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests + network.incoming.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets + feature_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - feature + binding_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - binding + network.incoming.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets.rate vcpus_cmaui: - cmaui - vcpus feature_cmaui: - cmaui - feature - network.incoming.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets + network.outgoing.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.packets.rate binding_cmaui: - cmaui - binding - attachment_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - attachment endpoint_cmaui: - cmaui - endpoint @@ -275,49 +281,43 @@ topology_template: disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate - network.outgoing.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes disk.usage_cmaui: - cmaui - disk.usage + network.outgoing.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes.rate disk.latency_cmaui: - cmaui - disk.latency - network.outgoing.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes.rate instance_cmaui: - cmaui - instance disk.allocation_cmaui: - cmaui - disk.allocation - network.incoming.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.bytes.rate + network.outgoing.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes disk.write.bytes_cmaui: - cmaui - disk.write.bytes cpu_util_cmaui: - cmaui - cpu_util - network.outpoing.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outpoing.packets disk.device.write.requests.rate_cmaui: - cmaui - disk.device.write.requests.rate requirements: - dependency_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - dependency - link_cmaui_cmaui02_port: - - cmaui_cmaui02_port + link_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - link + dependency_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - dependency dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml index 72ebfec0cd..4ca46a5ce1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml @@ -11,17 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui01_port_network_role: - type: string - required: true - port_cmaui01_port_order: - type: integer - required: true - port_cmaui01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -29,11 +18,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui01_port_security_groups: - type: list - required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -42,89 +26,105 @@ topology_template: required: true entry_schema: type: string - port_cmaui01_port_vlan_requirements: + port_cmaui01_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui01_port_1_order: + type: integer + required: true compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - port_cmaui01_port_subnetpoolid: - type: string + port_cmaui01_port_1_network: + type: list required: true + entry_schema: + type: string vm_image_name: type: string required: true - port_cmaui01_port_network_role_tag: + port_cmaui01_port_1_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_cmaui01_port_1_network_role_tag: type: string required: true - port_cmaui01_port_related_networks: + port_cmaui01_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cmaui01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui01_port_1_security_groups: + type: list required: true - port_cmaui01_port_mac_requirements: + entry_schema: + type: json + port_cmaui01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui01_port_fixed_ips: - type: list + port_cmaui01_port_1_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui01_port_network: + port_cmaui01_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_cmaui01_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui01_port_1_subnetpoolid: + type: string + required: true + port_cmaui01_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - cmaui_cmaui01_port: + cmaui_cmaui01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui01_port_replacement_policy + - port_cmaui01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_cmaui01_port_mac_requirements + get_input: port_cmaui01_port_1_mac_requirements order: - get_input: port_cmaui01_port_order + get_input: port_cmaui01_port_1_order security_groups: get_input: - - port_cmaui01_port_security_groups + - port_cmaui01_port_1_security_groups - index_value exCP_naming: - get_input: port_cmaui01_port_exCP_naming + get_input: port_cmaui01_port_1_exCP_naming vlan_requirements: - get_input: port_cmaui01_port_vlan_requirements + get_input: port_cmaui01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cmaui01_port_related_networks + get_input: port_cmaui01_port_1_related_networks ip_requirements: - get_input: port_cmaui01_port_ip_requirements + get_input: port_cmaui01_port_1_ip_requirements network_role_tag: - get_input: port_cmaui01_port_network_role_tag + get_input: port_cmaui01_port_1_network_role_tag network_role: - get_input: port_cmaui01_port_network_role + get_input: port_cmaui01_port_1_network_role fixed_ips: get_input: - - port_cmaui01_port_fixed_ips + - port_cmaui01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui01_port_subnetpoolid + get_input: port_cmaui01_port_1_subnetpoolid network: get_input: - - port_cmaui01_port_network + - port_cmaui01_port_1_network - index_value requirements: - binding: @@ -158,12 +158,9 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes - network.outgoing.bytes_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.bytes - network.incoming.packets.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.packets.rate + network.incoming.bytes_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.bytes disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -182,15 +179,15 @@ topology_template: disk.read.bytes_cmaui: - cmaui - disk.read.bytes + network.outpoing.packets_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outpoing.packets disk.write.requests_cmaui: - cmaui - disk.write.requests scalable_cmaui: - cmaui - scalable - feature_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - feature disk.device.write.bytes.rate_cmaui: - cmaui - disk.device.write.bytes.rate @@ -206,21 +203,15 @@ topology_template: os_cmaui: - cmaui - os - network.outgoing.bytes.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.packets.rate disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - network.incoming.bytes_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.bytes - forwarder_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - forwarder - network.outgoing.packets.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.bytes.rate disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -230,6 +221,9 @@ topology_template: disk.device.latency_cmaui: - cmaui - disk.device.latency + network.outgoing.bytes_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.bytes disk.device.read.requests_cmaui: - cmaui - disk.device.read.requests @@ -239,39 +233,42 @@ topology_template: cpu_cmaui: - cmaui - cpu - network.outpoing.packets_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outpoing.packets disk.read.requests_cmaui: - cmaui - disk.read.requests - attachment_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - attachment disk.device.read.bytes_cmaui: - cmaui - disk.device.read.bytes - network.incoming.packets_cmaui_cmaui01_port: - - cmaui_cmaui01_port + feature_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - feature + network.incoming.packets_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 - network.incoming.packets disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests - network.incoming.bytes.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.bytes.rate + forwarder_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - forwarder + binding_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - binding + network.incoming.packets.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.packets.rate vcpus_cmaui: - cmaui - vcpus - binding_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - binding feature_cmaui: - cmaui - feature binding_cmaui: - cmaui - binding + network.incoming.bytes.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.bytes.rate endpoint_cmaui: - cmaui - endpoint @@ -284,6 +281,9 @@ topology_template: memory_cmaui: - cmaui - memory + attachment_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - attachment disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate @@ -309,15 +309,15 @@ topology_template: - cmaui - disk.device.write.requests.rate requirements: - dependency_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - dependency - link_cmaui_cmaui01_port: - - cmaui_cmaui01_port + link_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 - link dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage
\ No newline at end of file + - local_storage + dependency_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml index 87232dd290..545037b77b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml @@ -11,19 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam02_port_network: + port_oam02_port_2_network: type: list required: true entry_schema: type: string - port_oam02_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam02_port_network_role: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -31,163 +23,165 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam02_port_fixed_ips: + port_oam02_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json vm_flavor_name: type: string required: true - port_oam02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam02_port_security_groups: + port_oam02_port_2_replacement_policy: type: list required: true entry_schema: - type: json - port_oam02_port_subnetpoolid: - type: string - required: true - port_oam02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_oam02_port_2_fixed_ips: + type: list required: true - port_oam02_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_image_name: type: string required: true - port_oam02_port_network_role_tag: + port_oam02_port_2_network_role_tag: type: string required: true - port_oam02_port_replacement_policy: + port_oam02_port_2_order: + type: integer + required: true + port_oam02_port_2_related_networks: type: list required: true entry_schema: - type: string - port_oam02_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam02_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements + port_oam02_port_2_network_role: + type: string + required: true + port_oam02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_oam_availability_zone: type: list required: true entry_schema: type: string - port_oam02_port_vlan_requirements: - type: list + port_oam02_port_2_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_name: type: list required: true entry_schema: type: string + port_oam02_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - oam_oam02_port: + oam: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam + properties: + availability_zone: + get_input: + - compute_oam_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_name + - index_value + oam_oam02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam02_port_replacement_policy + - port_oam02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_oam02_port_mac_requirements + get_input: port_oam02_port_2_mac_requirements order: - get_input: port_oam02_port_order + get_input: port_oam02_port_2_order security_groups: get_input: - - port_oam02_port_security_groups + - port_oam02_port_2_security_groups - index_value exCP_naming: - get_input: port_oam02_port_exCP_naming + get_input: port_oam02_port_2_exCP_naming vlan_requirements: - get_input: port_oam02_port_vlan_requirements + get_input: port_oam02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam02_port_related_networks + get_input: port_oam02_port_2_related_networks ip_requirements: - get_input: port_oam02_port_ip_requirements + get_input: port_oam02_port_2_ip_requirements network_role_tag: - get_input: port_oam02_port_network_role_tag + get_input: port_oam02_port_2_network_role_tag network_role: - get_input: port_oam02_port_network_role + get_input: port_oam02_port_2_network_role fixed_ips: get_input: - - port_oam02_port_fixed_ips + - port_oam02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_oam02_port_subnetpoolid + get_input: port_oam02_port_2_subnetpoolid network: get_input: - - port_oam02_port_network + - port_oam02_port_2_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam relationship: tosca.relationships.network.BindsTo - oam: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam - properties: - availability_zone: - get_input: - - compute_oam_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam capabilities: cpu_oam: - oam - cpu - network.incoming.bytes.rate_oam_oam02_port: - - oam_oam02_port - - network.incoming.bytes.rate disk.usage_oam: - oam - disk.usage memory.resident_oam: - oam - memory.resident + network.incoming.bytes.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes - network.incoming.packets_oam_oam02_port: - - oam_oam02_port - - network.incoming.packets + network.outgoing.bytes.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.bytes.rate disk.read.bytes_oam: - oam - disk.read.bytes - network.outgoing.packets.rate_oam_oam02_port: - - oam_oam02_port - - network.outgoing.packets.rate - binding_oam_oam02_port: - - oam_oam02_port - - binding scalable_oam: - oam - scalable - network.outgoing.bytes.rate_oam_oam02_port: - - oam_oam02_port - - network.outgoing.bytes.rate feature_oam: - oam - feature disk.allocation_oam: - oam - disk.allocation + network.incoming.packets.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.packets.rate disk.device.usage_oam: - oam - disk.device.usage @@ -197,6 +191,9 @@ topology_template: disk.device.read.bytes.rate_oam: - oam - disk.device.read.bytes.rate + network.incoming.bytes_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.bytes disk.write.bytes.rate_oam: - oam - disk.write.bytes.rate @@ -212,24 +209,33 @@ topology_template: disk.write.requests_oam: - oam - disk.write.requests - forwarder_oam_oam02_port: - - oam_oam02_port + forwarder_oam_oam02_port_2: + - oam_oam02_port_2 - forwarder disk.capacity_oam: - oam - disk.capacity + network.outgoing.packets.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.packets.rate + binding_oam_oam02_port_2: + - oam_oam02_port_2 + - binding instance_oam: - oam - instance - network.outgoing.bytes_oam_oam02_port: - - oam_oam02_port - - network.outgoing.bytes disk.root.size_oam: - oam - disk.root.size - network.incoming.packets.rate_oam_oam02_port: - - oam_oam02_port - - network.incoming.packets.rate + attachment_oam_oam02_port_2: + - oam_oam02_port_2 + - attachment + network.incoming.packets_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.packets + network.outgoing.bytes_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.bytes memory_oam: - oam - memory @@ -239,6 +245,12 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests + feature_oam_oam02_port_2: + - oam_oam02_port_2 + - feature + network.outpoing.packets_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outpoing.packets disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate @@ -275,15 +287,9 @@ topology_template: disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - feature_oam_oam02_port: - - oam_oam02_port - - feature cpu_util_oam: - oam - cpu_util - network.outpoing.packets_oam_oam02_port: - - oam_oam02_port - - network.outpoing.packets os_oam: - oam - os @@ -293,12 +299,6 @@ topology_template: disk.latency_oam: - oam - disk.latency - network.incoming.bytes_oam_oam02_port: - - oam_oam02_port - - network.incoming.bytes - attachment_oam_oam02_port: - - oam_oam02_port - - attachment disk.write.bytes_oam: - oam - disk.write.bytes @@ -309,15 +309,15 @@ topology_template: - oam - disk.device.capacity requirements: - link_oam_oam02_port: - - oam_oam02_port - - link + dependency_oam_oam02_port_2: + - oam_oam02_port_2 + - dependency local_storage_oam: - oam - local_storage - dependency_oam_oam02_port: - - oam_oam02_port - - dependency + link_oam_oam02_port_2: + - oam_oam02_port_2 + - link dependency_oam: - oam - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml index f6f3d190cd..07bc854756 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml @@ -11,30 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_oam01_port_subnetpoolid: + port_oam01_port_1_network_role: type: string required: true - port_oam01_port_order: - type: integer - required: true - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam01_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_oam01_port_network: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -42,7 +26,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam01_port_replacement_policy: + port_oam01_port_1_network: type: list required: true entry_schema: @@ -50,81 +34,97 @@ topology_template: vm_flavor_name: type: string required: true - port_oam01_port_related_networks: + port_oam01_port_1_security_groups: + type: list + required: true + entry_schema: + type: json + port_oam01_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: + port_oam01_port_1_order: + type: integer + required: true + port_oam01_port_1_subnetpoolid: type: string required: true - port_oam01_port_network_role: + vm_image_name: type: string required: true - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_oam01_port_1_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_oam_availability_zone: type: list required: true entry_schema: type: string - port_oam01_port_network_role_tag: + port_oam01_port_1_network_role_tag: type: string required: true - compute_oam_name: + port_oam01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_oam01_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_oam_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string node_templates: - oam_oam01_port: + oam_oam01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam01_port_replacement_policy + - port_oam01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_oam01_port_mac_requirements + get_input: port_oam01_port_1_mac_requirements order: - get_input: port_oam01_port_order + get_input: port_oam01_port_1_order security_groups: get_input: - - port_oam01_port_security_groups + - port_oam01_port_1_security_groups - index_value exCP_naming: - get_input: port_oam01_port_exCP_naming + get_input: port_oam01_port_1_exCP_naming vlan_requirements: - get_input: port_oam01_port_vlan_requirements + get_input: port_oam01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam01_port_related_networks + get_input: port_oam01_port_1_related_networks ip_requirements: - get_input: port_oam01_port_ip_requirements + get_input: port_oam01_port_1_ip_requirements network_role_tag: - get_input: port_oam01_port_network_role_tag + get_input: port_oam01_port_1_network_role_tag network_role: - get_input: port_oam01_port_network_role + get_input: port_oam01_port_1_network_role fixed_ips: get_input: - - port_oam01_port_fixed_ips + - port_oam01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_oam01_port_subnetpoolid + get_input: port_oam01_port_1_subnetpoolid network: get_input: - - port_oam01_port_network + - port_oam01_port_1_network - index_value requirements: - binding: @@ -152,36 +152,27 @@ topology_template: cpu_oam: - oam - cpu - network.outgoing.packets.rate_oam_oam01_port: - - oam_oam01_port - - network.outgoing.packets.rate - binding_oam_oam01_port: - - oam_oam01_port - - binding - network.outgoing.bytes.rate_oam_oam01_port: - - oam_oam01_port - - network.outgoing.bytes.rate disk.usage_oam: - oam - disk.usage memory.resident_oam: - oam - memory.resident + network.outgoing.bytes.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes + network.incoming.bytes.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.bytes.rate disk.read.bytes_oam: - oam - disk.read.bytes scalable_oam: - oam - scalable - attachment_oam_oam01_port: - - oam_oam01_port - - attachment - network.incoming.bytes_oam_oam01_port: - - oam_oam01_port - - network.incoming.bytes feature_oam: - oam - feature @@ -191,9 +182,6 @@ topology_template: disk.device.usage_oam: - oam - disk.device.usage - network.incoming.packets.rate_oam_oam01_port: - - oam_oam01_port - - network.incoming.packets.rate binding_oam: - oam - binding @@ -212,9 +200,6 @@ topology_template: disk.ephemeral.size_oam: - oam - disk.ephemeral.size - feature_oam_oam01_port: - - oam_oam01_port - - feature disk.write.requests_oam: - oam - disk.write.requests @@ -224,12 +209,18 @@ topology_template: instance_oam: - oam - instance - network.outpoing.packets_oam_oam01_port: - - oam_oam01_port - - network.outpoing.packets + attachment_oam_oam01_port_1: + - oam_oam01_port_1 + - attachment + network.incoming.packets_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.packets disk.root.size_oam: - oam - disk.root.size + network.outgoing.bytes_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.bytes memory_oam: - oam - memory @@ -239,12 +230,15 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests + feature_oam_oam01_port_1: + - oam_oam01_port_1 + - feature + network.outpoing.packets_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outpoing.packets disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate - network.outgoing.bytes_oam_oam01_port: - - oam_oam01_port - - network.outgoing.bytes disk.write.requests.rate_oam: - oam - disk.write.requests.rate @@ -260,9 +254,6 @@ topology_template: disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate - forwarder_oam_oam01_port: - - oam_oam01_port - - forwarder disk.device.read.bytes_oam: - oam - disk.device.read.bytes @@ -272,18 +263,21 @@ topology_template: endpoint_oam: - oam - endpoint - network.incoming.bytes.rate_oam_oam01_port: - - oam_oam01_port - - network.incoming.bytes.rate disk.device.read.requests_oam: - oam - disk.device.read.requests + network.incoming.packets.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.packets.rate disk.iops_oam: - oam - disk.iops disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate + network.incoming.bytes_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.bytes cpu_util_oam: - oam - cpu_util @@ -296,28 +290,34 @@ topology_template: disk.latency_oam: - oam - disk.latency + forwarder_oam_oam01_port_1: + - oam_oam01_port_1 + - forwarder + network.outgoing.packets.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.packets.rate disk.write.bytes_oam: - oam - disk.write.bytes + binding_oam_oam01_port_1: + - oam_oam01_port_1 + - binding disk.read.requests_oam: - oam - disk.read.requests disk.device.capacity_oam: - oam - disk.device.capacity - network.incoming.packets_oam_oam01_port: - - oam_oam01_port - - network.incoming.packets requirements: local_storage_oam: - oam - local_storage - dependency_oam_oam01_port: - - oam_oam01_port + dependency_oam_oam01_port_1: + - oam_oam01_port_1 - dependency - link_oam_oam01_port: - - oam_oam01_port + link_oam_oam01_port_1: + - oam_oam01_port_1 - link dependency_oam: - oam - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 9d8385b905..d2a3d40128 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +33,50 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string + required: true + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -152,6 +155,9 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -167,12 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +185,9 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -206,9 +200,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,9 +209,6 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding @@ -233,12 +221,18 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -251,6 +245,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -260,24 +257,27 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +287,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index 34e182d166..0b507de50e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml index 1ef6099449..83f47e734a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_pd02_port_2_order: + type: integer + required: true + port_pd02_port_2_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,70 +29,64 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_pd02_port_order: - type: integer + port_pd02_port_2_network: + type: list required: true - port_pd02_port_subnetpoolid: - type: string + entry_schema: + type: string + port_pd02_port_2_vlan_requirements: + type: list required: true - port_pd02_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_2_subnetpoolid: type: string required: true - port_pd02_port_vlan_requirements: + port_pd02_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_flavor_name: type: string required: true - port_pd02_port_security_groups: + port_pd02_port_2_ip_requirements: type: list required: true entry_schema: - type: json - compute_ps_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_2_security_groups: type: list required: true entry_schema: - type: string - port_pd02_port_replacement_policy: + type: json + port_pd02_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_pd02_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_image_name: type: string required: true - compute_ps_name: + compute_ps_availability_zone: type: list required: true entry_schema: type: string - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: - type: list + port_pd02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + compute_ps_name: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list + port_pd02_port_2_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: ps: type: org.openecomp.resource.vfc.compute.nodes.heat.ps @@ -103,43 +103,43 @@ topology_template: get_input: - compute_ps_name - index_value - ps_pd02_port: + ps_pd02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd02_port_replacement_policy + - port_pd02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_2_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_2_order security_groups: get_input: - - port_pd02_port_security_groups + - port_pd02_port_2_security_groups - index_value exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_2_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_2_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_2_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_2_network_role_tag network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_2_network_role fixed_ips: get_input: - - port_pd02_port_fixed_ips + - port_pd02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_2_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_2_network - index_value requirements: - binding: @@ -176,30 +176,30 @@ topology_template: disk.device.usage_ps: - ps - disk.device.usage - forwarder_ps_pd02_port: - - ps_pd02_port - - forwarder - network.outgoing.bytes.rate_ps_pd02_port: - - ps_pd02_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.bytes.rate endpoint_ps: - ps - endpoint + network.outgoing.bytes.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outgoing.bytes.rate disk.device.capacity_ps: - ps - disk.device.capacity cpu_ps: - ps - cpu - network.incoming.packets_ps_pd02_port: - - ps_pd02_port - - network.incoming.packets + network.outgoing.packets.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outgoing.packets.rate + binding_ps_pd02_port_2: + - ps_pd02_port_2 + - binding disk.device.write.bytes_ps: - ps - disk.device.write.bytes - network.outgoing.packets.rate_ps_pd02_port: - - ps_pd02_port - - network.outgoing.packets.rate cpu.delta_ps: - ps - cpu.delta @@ -212,26 +212,29 @@ topology_template: binding_ps: - ps - binding - binding_ps_pd02_port: - - ps_pd02_port - - binding + network.outpoing.packets_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outpoing.packets + feature_ps_pd02_port_2: + - ps_pd02_port_2 + - feature disk.device.write.requests.rate_ps: - ps - disk.device.write.requests.rate - network.outgoing.bytes_ps_pd02_port: - - ps_pd02_port + network.outgoing.bytes_ps_pd02_port_2: + - ps_pd02_port_2 - network.outgoing.bytes cpu_util_ps: - ps - cpu_util - network.outpoing.packets_ps_pd02_port: - - ps_pd02_port - - network.outpoing.packets - network.incoming.packets.rate_ps_pd02_port: - - ps_pd02_port - - network.incoming.packets.rate - network.incoming.bytes_ps_pd02_port: - - ps_pd02_port + forwarder_ps_pd02_port_2: + - ps_pd02_port_2 + - forwarder + attachment_ps_pd02_port_2: + - ps_pd02_port_2 + - attachment + network.incoming.bytes_ps_pd02_port_2: + - ps_pd02_port_2 - network.incoming.bytes disk.read.bytes.rate_ps: - ps @@ -248,6 +251,9 @@ topology_template: instance_ps: - ps - instance + network.incoming.packets.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.packets.rate disk.latency_ps: - ps - disk.latency @@ -269,9 +275,6 @@ topology_template: memory_ps: - ps - memory - feature_ps_pd02_port: - - ps_pd02_port - - feature disk.usage_ps: - ps - disk.usage @@ -287,9 +290,6 @@ topology_template: disk.allocation_ps: - ps - disk.allocation - attachment_ps_pd02_port: - - ps_pd02_port - - attachment disk.device.read.requests_ps: - ps - disk.device.read.requests @@ -299,9 +299,9 @@ topology_template: disk.device.latency_ps: - ps - disk.device.latency - network.incoming.bytes.rate_ps_pd02_port: - - ps_pd02_port - - network.incoming.bytes.rate + network.incoming.packets_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.packets disk.device.write.requests_ps: - ps - disk.device.write.requests @@ -309,15 +309,15 @@ topology_template: - ps - disk.write.bytes requirements: - dependency_ps_pd02_port: - - ps_pd02_port - - dependency - link_ps_pd02_port: - - ps_pd02_port + link_ps_pd02_port_2: + - ps_pd02_port_2 - link dependency_ps: - ps - dependency local_storage_ps: - ps - - local_storage
\ No newline at end of file + - local_storage + dependency_ps_pd02_port_2: + - ps_pd02_port_2 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml index 7c142e6996..b8458d6726 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml @@ -11,6 +11,16 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_security_groups: + type: list + required: true + entry_schema: + type: json + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,15 +28,10 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -34,14 +39,20 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd01_port_1_network_role: + type: string + required: true + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_pd01_port_1_subnetpoolid: + type: string + required: true vm_image_name: type: string required: true @@ -50,43 +61,32 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: - type: list + type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + compute_ps_name: type: list required: true entry_schema: type: string - compute_ps_name: + port_pd01_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string node_templates: ps: type: org.openecomp.resource.vfc.compute.nodes.heat.ps @@ -103,43 +103,43 @@ topology_template: get_input: - compute_ps_name - index_value - ps_pd01_port: + ps_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd01_port_1_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role fixed_ips: get_input: - - port_pd01_port_fixed_ips + - port_pd01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -155,9 +155,6 @@ topology_template: disk.device.iops_ps: - ps - disk.device.iops - network.incoming.packets_ps_pd01_port: - - ps_pd01_port - - network.incoming.packets scalable_ps: - ps - scalable @@ -179,30 +176,27 @@ topology_template: disk.device.usage_ps: - ps - disk.device.usage + network.incoming.bytes.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.bytes.rate endpoint_ps: - ps - endpoint - network.incoming.bytes.rate_ps_pd01_port: - - ps_pd01_port - - network.incoming.bytes.rate disk.device.capacity_ps: - ps - disk.device.capacity cpu_ps: - ps - cpu - attachment_ps_pd01_port: - - ps_pd01_port - - attachment disk.device.write.bytes_ps: - ps - disk.device.write.bytes - forwarder_ps_pd01_port: - - ps_pd01_port - - forwarder cpu.delta_ps: - ps - cpu.delta + network.incoming.packets_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.packets disk.root.size_ps: - ps - disk.root.size @@ -212,18 +206,12 @@ topology_template: binding_ps: - ps - binding - network.incoming.packets.rate_ps_pd01_port: - - ps_pd01_port - - network.incoming.packets.rate disk.device.write.requests.rate_ps: - ps - disk.device.write.requests.rate - feature_ps_pd01_port: - - ps_pd01_port - - feature - network.incoming.bytes_ps_pd01_port: - - ps_pd01_port - - network.incoming.bytes + network.outgoing.bytes_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outgoing.bytes cpu_util_ps: - ps - cpu_util @@ -233,39 +221,48 @@ topology_template: disk.device.read.bytes.rate_ps: - ps - disk.device.read.bytes.rate + forwarder_ps_pd01_port_1: + - ps_pd01_port_1 + - forwarder disk.read.requests_ps: - ps - disk.read.requests vcpus_ps: - ps - vcpus + network.incoming.packets.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.packets.rate + attachment_ps_pd01_port_1: + - ps_pd01_port_1 + - attachment + network.incoming.bytes_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.bytes instance_ps: - ps - instance disk.latency_ps: - ps - disk.latency - network.outpoing.packets_ps_pd01_port: - - ps_pd01_port - - network.outpoing.packets disk.device.read.bytes_ps: - ps - disk.device.read.bytes memory.usage_ps: - ps - memory.usage - binding_ps_pd01_port: - - ps_pd01_port - - binding + network.outgoing.bytes.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outgoing.bytes.rate + feature_ps_pd01_port_1: + - ps_pd01_port_1 + - feature feature_ps: - ps - feature disk.device.write.bytes.rate_ps: - ps - disk.device.write.bytes.rate - network.outgoing.bytes_ps_pd01_port: - - ps_pd01_port - - network.outgoing.bytes disk.ephemeral.size_ps: - ps - disk.ephemeral.size @@ -281,9 +278,12 @@ topology_template: os_ps: - ps - os - network.outgoing.packets.rate_ps_pd01_port: - - ps_pd01_port + network.outgoing.packets.rate_ps_pd01_port_1: + - ps_pd01_port_1 - network.outgoing.packets.rate + binding_ps_pd01_port_1: + - ps_pd01_port_1 + - binding disk.iops_ps: - ps - disk.iops @@ -299,9 +299,9 @@ topology_template: disk.device.latency_ps: - ps - disk.device.latency - network.outgoing.bytes.rate_ps_pd01_port: - - ps_pd01_port - - network.outgoing.bytes.rate + network.outpoing.packets_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outpoing.packets disk.device.write.requests_ps: - ps - disk.device.write.requests @@ -309,15 +309,15 @@ topology_template: - ps - disk.write.bytes requirements: + link_ps_pd01_port_1: + - ps_pd01_port_1 + - link + dependency_ps_pd01_port_1: + - ps_pd01_port_1 + - dependency dependency_ps: - ps - dependency local_storage_ps: - ps - local_storage - dependency_ps_pd01_port: - - ps_pd01_port - - dependency - link_ps_pd01_port: - - ps_pd01_port - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml index aa2ed981f2..118eee3b23 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -62,36 +62,36 @@ topology_template: directives: - substitutable properties: - port_cmaui02_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui02_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui02_port_2_network: + - get_input: net + port_cmaui02_port_2_replacement_policy: + - AUTO vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 1 - compute_cmaui_availability_zone: - - get_input: availability_zone_0 - vm_image_name: - get_input: cmaui_image - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cmaui02_port_replacement_policy: - - AUTO - port_cmaui02_port_security_groups: + compute_cmaui_availability_zone: + - get_input: availability_zone_0 + vm_image_name: + get_input: cmaui_image + port_cmaui02_port_2_security_groups: - - get_input: p2 - port_cmaui02_port_network: - - get_input: net + port_cmaui02_port_2_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui02_port_2_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -105,32 +105,32 @@ topology_template: directives: - substitutable properties: - port_cmaui01_port_replacement_policy: - - AUTO - port_cmaui01_port_security_groups: - - - get_input: p1 - - get_input: p2 vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 0 + port_cmaui01_port_1_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 compute_cmaui_availability_zone: - get_input: availability_zone_0 + port_cmaui01_port_1_network: + - get_input: net vm_image_name: get_input: cmaui_image - port_cmaui01_port_mac_requirements: + port_cmaui01_port_1_replacement_policy: + - AUTO + port_cmaui01_port_1_security_groups: + - - get_input: p1 + - get_input: p2 + port_cmaui01_port_1_mac_requirements: mac_count_required: is_required: false - port_cmaui01_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui01_port_network: - - get_input: net - port_cmaui01_port_ip_requirements: + port_cmaui01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -179,16 +179,16 @@ topology_template: - feature_pd01_port_1_test_nested3Level network.outgoing.packets.rate_cmaui02_port_2: - abstract_cmaui - - network.outgoing.packets.rate_cmaui_cmaui02_port + - network.outgoing.packets.rate_cmaui_cmaui02_port_2 binding_cmaui02_port_2: - abstract_cmaui - - binding_cmaui_cmaui02_port + - binding_cmaui_cmaui02_port_2 disk.device.latency_server_cmaui_1: - abstract_cmaui_1 - disk.device.latency_cmaui network.outgoing.bytes.rate_cmaui02_port_2: - abstract_cmaui - - network.outgoing.bytes.rate_cmaui_cmaui02_port + - network.outgoing.bytes.rate_cmaui_cmaui02_port_2 disk.device.latency_server_cmaui_2: - abstract_cmaui - disk.device.latency_cmaui @@ -209,13 +209,13 @@ topology_template: - disk.device.latency_server_ps_1_test_nested3Level attachment_cmaui01_port_1: - abstract_cmaui_1 - - attachment_cmaui_cmaui01_port + - attachment_cmaui_cmaui01_port_1 disk.write.bytes_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.bytes_server_ps_1_test_nested3Level network.incoming.bytes.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.bytes.rate_cmaui_cmaui01_port + - network.incoming.bytes.rate_cmaui_cmaui01_port_1 disk.capacity_server_oam_1_test_nested2Level: - test_nested2Level - disk.capacity_server_oam_1 @@ -248,7 +248,7 @@ topology_template: - disk.device.read.bytes.rate_cmaui feature_cmaui02_port_2: - abstract_cmaui - - feature_cmaui_cmaui02_port + - feature_cmaui_cmaui02_port_2 disk.device.read.bytes.rate_server_cmaui_1: - abstract_cmaui_1 - disk.device.read.bytes.rate_cmaui @@ -287,7 +287,7 @@ topology_template: - disk.iops_server_oam_2 network.outpoing.packets_cmaui02_port_2: - abstract_cmaui - - network.outpoing.packets_cmaui_cmaui02_port + - network.outpoing.packets_cmaui_cmaui02_port_2 attachment_pd01_port_1_test_nested3Level_test_nested2Level: - test_nested2Level - attachment_pd01_port_1_test_nested3Level @@ -314,7 +314,7 @@ topology_template: - cpu_util_server_ps_2_test_nested3Level network.outgoing.bytes_cmaui02_port_2: - abstract_cmaui - - network.outgoing.bytes_cmaui_cmaui02_port + - network.outgoing.bytes_cmaui_cmaui02_port_2 feature_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - feature_server_ps_1_test_nested3Level @@ -344,7 +344,7 @@ topology_template: - disk.device.write.bytes.rate_server_ps_2_test_nested3Level forwarder_cmaui01_port_1: - abstract_cmaui_1 - - forwarder_cmaui_cmaui01_port + - forwarder_cmaui_cmaui01_port_1 network.outgoing.bytes.rate_oam02_port_2_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_oam02_port_2 @@ -419,7 +419,7 @@ topology_template: - cpu_util_cmaui network.incoming.packets_cmaui02_port_2: - abstract_cmaui - - network.incoming.packets_cmaui_cmaui02_port + - network.incoming.packets_cmaui_cmaui02_port_2 disk.device.write.bytes.rate_server_cmaui_2: - abstract_cmaui - disk.device.write.bytes.rate_cmaui @@ -482,7 +482,7 @@ topology_template: - disk.device.usage_server_ps_2_test_nested3Level network.incoming.bytes_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.bytes_cmaui_cmaui01_port + - network.incoming.bytes_cmaui_cmaui01_port_1 instance_server_oam_2_test_nested2Level: - test_nested2Level - instance_server_oam_2 @@ -590,7 +590,7 @@ topology_template: - feature_oam01_port_1 network.outgoing.bytes_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.bytes_cmaui_cmaui01_port + - network.outgoing.bytes_cmaui_cmaui01_port_1 instance_server_cmaui_2: - abstract_cmaui - instance_cmaui @@ -602,7 +602,7 @@ topology_template: - memory.resident_server_ps_2_test_nested3Level network.incoming.packets.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.packets.rate_cmaui_cmaui01_port + - network.incoming.packets.rate_cmaui_cmaui01_port_1 disk.read.requests_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.requests_server_ps_1_test_nested3Level @@ -677,10 +677,10 @@ topology_template: - disk.device.usage_cmaui network.outgoing.packets.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.packets.rate_cmaui_cmaui01_port + - network.outgoing.packets.rate_cmaui_cmaui01_port_1 binding_cmaui01_port_1: - abstract_cmaui_1 - - binding_cmaui_cmaui01_port + - binding_cmaui_cmaui01_port_1 scalable_server_oam_2_test_nested2Level: - test_nested2Level - scalable_server_oam_2 @@ -695,7 +695,7 @@ topology_template: - disk.device.write.requests.rate_server_ps_2_test_nested3Level network.outgoing.bytes.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.bytes.rate_cmaui_cmaui01_port + - network.outgoing.bytes.rate_cmaui_cmaui01_port_1 memory_server_ps_2_test_nested3Level_test_nested2Level: - test_nested2Level - memory_server_ps_2_test_nested3Level @@ -719,7 +719,7 @@ topology_template: - disk.device.allocation_server_oam_1 network.incoming.bytes.rate_cmaui02_port_2: - abstract_cmaui - - network.incoming.bytes.rate_cmaui_cmaui02_port + - network.incoming.bytes.rate_cmaui_cmaui02_port_2 endpoint_server_oam_2_test_nested2Level: - test_nested2Level - endpoint_server_oam_2 @@ -734,7 +734,7 @@ topology_template: - disk.iops_server_ps_2_test_nested3Level attachment_cmaui02_port_2: - abstract_cmaui - - attachment_cmaui_cmaui02_port + - attachment_cmaui_cmaui02_port_2 disk.write.bytes.rate_server_oam_2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_oam_2 @@ -809,7 +809,7 @@ topology_template: - host_server_oam_2 forwarder_cmaui02_port_2: - abstract_cmaui - - forwarder_cmaui_cmaui02_port + - forwarder_cmaui_cmaui02_port_2 feature_server_oam_2_test_nested2Level: - test_nested2Level - feature_server_oam_2 @@ -839,7 +839,7 @@ topology_template: - disk.device.capacity_server_ps_1_test_nested3Level feature_cmaui01_port_1: - abstract_cmaui_1 - - feature_cmaui_cmaui01_port + - feature_cmaui_cmaui01_port_1 disk.device.read.requests.rate_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_ps_1_test_nested3Level @@ -911,7 +911,7 @@ topology_template: - memory.usage_server_ps_2_test_nested3Level network.incoming.bytes_cmaui02_port_2: - abstract_cmaui - - network.incoming.bytes_cmaui_cmaui02_port + - network.incoming.bytes_cmaui_cmaui02_port_2 disk.write.requests_server_cmaui_2: - abstract_cmaui - disk.write.requests_cmaui @@ -989,7 +989,7 @@ topology_template: - network.outgoing.packets.rate_pd02_port_2_test_nested3Level network.incoming.packets_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui01_port + - network.incoming.packets_cmaui_cmaui01_port_1 disk.read.bytes_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.bytes_server_ps_1_test_nested3Level @@ -1040,7 +1040,7 @@ topology_template: - network.outgoing.bytes_oam01_port_1 network.incoming.packets.rate_cmaui02_port_2: - abstract_cmaui - - network.incoming.packets.rate_cmaui_cmaui02_port + - network.incoming.packets.rate_cmaui_cmaui02_port_2 disk.device.write.requests_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_ps_1_test_nested3Level @@ -1127,17 +1127,17 @@ topology_template: - memory.usage_cmaui network.outpoing.packets_cmaui01_port_1: - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui01_port + - network.outpoing.packets_cmaui_cmaui01_port_1 requirements: link_cmaui01_port_1: - abstract_cmaui_1 - - link_cmaui_cmaui01_port + - link_cmaui_cmaui01_port_1 local_storage_server_oam_2_test_nested2Level: - test_nested2Level - local_storage_server_oam_2 link_cmaui02_port_2: - abstract_cmaui - - link_cmaui_cmaui02_port + - link_cmaui_cmaui02_port_2 dependency_test_nested2Level: - test_nested2Level - dependency @@ -1155,10 +1155,10 @@ topology_template: - dependency_oam01_port_1 dependency_cmaui01_port_1: - abstract_cmaui_1 - - dependency_cmaui_cmaui01_port + - dependency_cmaui_cmaui01_port_1 dependency_cmaui02_port_2: - abstract_cmaui - - dependency_cmaui_cmaui02_port + - dependency_cmaui_cmaui02_port_2 dependency_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_server_ps_1_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml index 07c709079f..7e6940549d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -62,33 +62,33 @@ topology_template: directives: - substitutable properties: - port_oam01_port_mac_requirements: - mac_count_required: - is_required: false - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam01_port_security_groups: - - - get_input: p2 - - get_input: p1 - port_oam01_port_network: + port_oam01_port_1_network: - get_input: net - port_oam01_port_replacement_policy: - - AUTO vm_flavor_name: get_input: cmaui_flavor + port_oam01_port_1_security_groups: + - - get_input: p2 + - get_input: p1 vm_image_name: get_input: cmaui_image - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: + - AUTO + port_oam01_port_1_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 compute_oam_availability_zone: - get_input: availability_zone_0 + port_oam01_port_1_mac_requirements: + mac_count_required: + is_required: false compute_oam_name: - get_input: - oam_names @@ -106,30 +106,30 @@ topology_template: directives: - substitutable properties: - port_oam02_port_network: + port_oam02_port_2_network: - get_input: net - port_oam02_port_ip_requirements: + port_oam02_port_2_security_groups: + - - get_input: p1 + vm_flavor_name: + get_input: cmaui_flavor + port_oam02_port_2_replacement_policy: + - AUTO + port_oam02_port_2_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + vm_image_name: + get_input: cmaui_image + port_oam02_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam02_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - vm_flavor_name: - get_input: cmaui_flavor - port_oam02_port_security_groups: - - - get_input: p1 - port_oam02_port_mac_requirements: + port_oam02_port_2_mac_requirements: mac_count_required: is_required: false - vm_image_name: - get_input: cmaui_image - port_oam02_port_replacement_policy: - - AUTO compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_name: @@ -168,7 +168,7 @@ topology_template: capabilities: network.incoming.packets.rate_oam02_port_2: - abstract_oam - - network.incoming.packets.rate_oam_oam02_port + - network.incoming.packets.rate_oam_oam02_port_2 disk.latency_server_oam_2: - abstract_oam - disk.latency_oam @@ -186,7 +186,7 @@ topology_template: - disk.latency_oam network.incoming.bytes_oam02_port_2: - abstract_oam - - network.incoming.bytes_oam_oam02_port + - network.incoming.bytes_oam_oam02_port_2 endpoint_server_oam_1: - abstract_oam_1 - endpoint_oam @@ -210,7 +210,7 @@ topology_template: - disk.device.read.bytes_oam forwarder_oam01_port_1: - abstract_oam_1 - - forwarder_oam_oam01_port + - forwarder_oam_oam01_port_1 disk.device.read.bytes_server_oam_2: - abstract_oam - disk.device.read.bytes_oam @@ -219,7 +219,7 @@ topology_template: - cpu.delta_oam attachment_oam01_port_1: - abstract_oam_1 - - attachment_oam_oam01_port + - attachment_oam_oam01_port_1 disk.write.bytes_server_ps_1_test_nested3Level: - test_nested3Level - disk.write.bytes_server_ps_1 @@ -285,7 +285,7 @@ topology_template: - disk.capacity_oam network.incoming.packets_oam01_port_1: - abstract_oam_1 - - network.incoming.packets_oam_oam01_port + - network.incoming.packets_oam_oam01_port_1 disk.device.read.requests.rate_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_ps_1 @@ -300,7 +300,7 @@ topology_template: - disk.capacity_server_ps_2 network.outgoing.bytes.rate_oam01_port_1: - abstract_oam_1 - - network.outgoing.bytes.rate_oam_oam01_port + - network.outgoing.bytes.rate_oam_oam01_port_1 disk.iops_server_ps_2_test_nested3Level: - test_nested3Level - disk.iops_server_ps_2 @@ -396,7 +396,7 @@ topology_template: - disk.allocation_server_ps_2 binding_oam02_port_2: - abstract_oam - - binding_oam_oam02_port + - binding_oam_oam02_port_2 binding_server_oam_1: - abstract_oam_1 - binding_oam @@ -408,10 +408,10 @@ topology_template: - endpoint_server_ps_2 network.outgoing.bytes_oam02_port_2: - abstract_oam - - network.outgoing.bytes_oam_oam02_port + - network.outgoing.bytes_oam_oam02_port_2 network.outpoing.packets_oam01_port_1: - abstract_oam_1 - - network.outpoing.packets_oam_oam01_port + - network.outpoing.packets_oam_oam01_port_1 disk.device.read.bytes.rate_server_oam_1: - abstract_oam_1 - disk.device.read.bytes.rate_oam @@ -438,7 +438,7 @@ topology_template: - instance_oam network.incoming.packets_oam02_port_2: - abstract_oam - - network.incoming.packets_oam_oam02_port + - network.incoming.packets_oam_oam02_port_2 disk.read.bytes_server_ps_2_test_nested3Level: - test_nested3Level - disk.read.bytes_server_ps_2 @@ -465,7 +465,7 @@ topology_template: - host_server_ps_1 attachment_oam02_port_2: - abstract_oam - - attachment_oam_oam02_port + - attachment_oam_oam02_port_2 disk.device.iops_server_oam_2: - abstract_oam - disk.device.iops_oam @@ -489,7 +489,7 @@ topology_template: - disk.device.capacity_server_ps_1 network.incoming.bytes.rate_oam02_port_2: - abstract_oam - - network.incoming.bytes.rate_oam_oam02_port + - network.incoming.bytes.rate_oam_oam02_port_2 disk.write.requests.rate_server_ps_2_test_nested3Level: - test_nested3Level - disk.write.requests.rate_server_ps_2 @@ -498,7 +498,7 @@ topology_template: - disk.latency_server_ps_2 network.incoming.packets.rate_oam01_port_1: - abstract_oam_1 - - network.incoming.packets.rate_oam_oam01_port + - network.incoming.packets.rate_oam_oam01_port_1 disk.device.latency_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.latency_server_ps_1 @@ -519,13 +519,13 @@ topology_template: - attachment_pd02_port_2 network.incoming.bytes_oam01_port_1: - abstract_oam_1 - - network.incoming.bytes_oam_oam01_port + - network.incoming.bytes_oam_oam01_port_1 cpu_server_ps_2_test_nested3Level: - test_nested3Level - cpu_server_ps_2 forwarder_oam02_port_2: - abstract_oam - - forwarder_oam_oam02_port + - forwarder_oam_oam02_port_2 network.incoming.packets.rate_pd01_port_1_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_pd01_port_1 @@ -537,13 +537,13 @@ topology_template: - os_oam network.outgoing.packets.rate_oam02_port_2: - abstract_oam - - network.outgoing.packets.rate_oam_oam02_port + - network.outgoing.packets.rate_oam_oam02_port_2 disk.device.latency_server_ps_2_test_nested3Level: - test_nested3Level - disk.device.latency_server_ps_2 feature_oam01_port_1: - abstract_oam_1 - - feature_oam_oam01_port + - feature_oam_oam01_port_1 disk.device.allocation_server_oam_2: - abstract_oam - disk.device.allocation_oam @@ -558,7 +558,7 @@ topology_template: - cpu_util_server_ps_2 network.incoming.bytes.rate_oam01_port_1: - abstract_oam_1 - - network.incoming.bytes.rate_oam_oam01_port + - network.incoming.bytes.rate_oam_oam01_port_1 vcpus_server_oam_2: - abstract_oam - vcpus_oam @@ -588,7 +588,7 @@ topology_template: - network.incoming.bytes.rate_pd02_port_2 network.outgoing.bytes.rate_oam02_port_2: - abstract_oam - - network.outgoing.bytes.rate_oam_oam02_port + - network.outgoing.bytes.rate_oam_oam02_port_2 vcpus_server_oam_1: - abstract_oam_1 - vcpus_oam @@ -612,7 +612,7 @@ topology_template: - cpu_oam binding_oam01_port_1: - abstract_oam_1 - - binding_oam_oam01_port + - binding_oam_oam01_port_1 disk.device.write.requests_server_ps_2_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_ps_2 @@ -756,7 +756,7 @@ topology_template: - disk.device.capacity_oam network.outgoing.packets.rate_oam01_port_1: - abstract_oam_1 - - network.outgoing.packets.rate_oam_oam01_port + - network.outgoing.packets.rate_oam_oam01_port_1 disk.device.read.requests_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.read.requests_server_ps_1 @@ -765,13 +765,13 @@ topology_template: - disk.read.bytes.rate_server_ps_2 feature_oam02_port_2: - abstract_oam - - feature_oam_oam02_port + - feature_oam_oam02_port_2 network.outgoing.bytes_oam01_port_1: - abstract_oam_1 - - network.outgoing.bytes_oam_oam01_port + - network.outgoing.bytes_oam_oam01_port_1 network.outpoing.packets_oam02_port_2: - abstract_oam - - network.outpoing.packets_oam_oam02_port + - network.outpoing.packets_oam_oam02_port_2 network.incoming.packets_pd01_port_1_test_nested3Level: - test_nested3Level - network.incoming.packets_pd01_port_1 @@ -808,13 +808,13 @@ topology_template: requirements: link_oam02_port_2: - abstract_oam - - link_oam_oam02_port + - link_oam_oam02_port_2 dependency_pd01_port_1_test_nested3Level: - test_nested3Level - dependency_pd01_port_1 link_oam01_port_1: - abstract_oam_1 - - link_oam_oam01_port + - link_oam_oam01_port_1 dependency_server_oam_1: - abstract_oam_1 - dependency_oam @@ -841,10 +841,10 @@ topology_template: - link_pd01_port_1 dependency_oam01_port_1: - abstract_oam_1 - - dependency_oam_oam01_port + - dependency_oam_oam01_port_1 dependency_oam02_port_2: - abstract_oam - - dependency_oam_oam02_port + - dependency_oam_oam02_port_2 dependency_test_nested3Level: - test_nested3Level - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml index 1a19d76b8c..82b9147bb8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -62,36 +62,36 @@ topology_template: directives: - substitutable properties: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: + - AUTO + port_pd02_port_2_network: + - get_input: net + vm_flavor_name: + get_input: cmaui_flavor + port_pd02_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pd02_port_2_security_groups: + - - get_input: p1 + port_pd02_port_2_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - vm_flavor_name: - get_input: cmaui_flavor vm_image_name: get_input: cmaui_image - port_pd02_port_security_groups: - - - get_input: p1 compute_ps_availability_zone: - get_input: availability_zone_0 - port_pd02_port_replacement_policy: - - AUTO + port_pd02_port_2_mac_requirements: + mac_count_required: + is_required: false compute_ps_name: - get_input: - ps_names - 0 - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: net service_template_filter: substitute_service_template: Nested_psServiceTemplate.yaml count: 1 @@ -105,37 +105,37 @@ topology_template: directives: - substitutable properties: - port_pd01_port_replacement_policy: - - AUTO - vm_flavor_name: - get_input: cmaui_flavor - port_pd01_port_security_groups: + port_pd01_port_1_security_groups: - - get_input: p2 - get_input: p1 - port_pd01_port_mac_requirements: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + vm_flavor_name: + get_input: cmaui_flavor + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: cmaui_image compute_ps_availability_zone: - get_input: availability_zone_0 - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: + - AUTO + compute_ps_name: + - get_input: + - ps_names + - 0 + port_pd01_port_1_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network: - get_input: net - compute_ps_name: - - get_input: - - ps_names - - 0 service_template_filter: substitute_service_template: Nested_ps_1ServiceTemplate.yaml count: 1 @@ -179,13 +179,13 @@ topology_template: - disk.capacity_ps network.outgoing.bytes_pd02_port_2: - abstract_ps - - network.outgoing.bytes_ps_pd02_port + - network.outgoing.bytes_ps_pd02_port_2 disk.capacity_server_ps_2: - abstract_ps - disk.capacity_ps network.outgoing.bytes_pd01_port_1: - abstract_ps_1 - - network.outgoing.bytes_ps_pd01_port + - network.outgoing.bytes_ps_pd01_port_1 memory.usage_server_ps_1: - abstract_ps_1 - memory.usage_ps @@ -248,13 +248,13 @@ topology_template: - endpoint_ps binding_pd01_port_1: - abstract_ps_1 - - binding_ps_pd01_port + - binding_ps_pd01_port_1 disk.device.read.requests.rate_server_ps_1: - abstract_ps_1 - disk.device.read.requests.rate_ps network.outgoing.bytes.rate_pd02_port_2: - abstract_ps - - network.outgoing.bytes.rate_ps_pd02_port + - network.outgoing.bytes.rate_ps_pd02_port_2 host_server_ps_2: - abstract_ps - host_ps @@ -275,13 +275,13 @@ topology_template: - scalable_ps network.incoming.packets.rate_pd02_port_2: - abstract_ps - - network.incoming.packets.rate_ps_pd02_port + - network.incoming.packets.rate_ps_pd02_port_2 scalable_server_ps_2: - abstract_ps - scalable_ps network.outgoing.packets.rate_pd01_port_1: - abstract_ps_1 - - network.outgoing.packets.rate_ps_pd01_port + - network.outgoing.packets.rate_ps_pd01_port_1 disk.write.bytes.rate_server_ps_2: - abstract_ps - disk.write.bytes.rate_ps @@ -302,7 +302,7 @@ topology_template: - disk.ephemeral.size_ps feature_pd02_port_2: - abstract_ps - - feature_ps_pd02_port + - feature_ps_pd02_port_2 disk.ephemeral.size_server_ps_2: - abstract_ps - disk.ephemeral.size_ps @@ -320,7 +320,7 @@ topology_template: - disk.allocation_ps attachment_pd01_port_1: - abstract_ps_1 - - attachment_ps_pd01_port + - attachment_ps_pd01_port_1 memory.resident_server_ps_1: - abstract_ps_1 - memory.resident_ps @@ -341,7 +341,7 @@ topology_template: - disk.device.read.requests_ps network.incoming.bytes.rate_pd01_port_1: - abstract_ps_1 - - network.incoming.bytes.rate_ps_pd01_port + - network.incoming.bytes.rate_ps_pd01_port_1 disk.read.bytes.rate_server_ps_1: - abstract_ps_1 - disk.read.bytes.rate_ps @@ -353,7 +353,7 @@ topology_template: - disk.device.iops_ps feature_pd01_port_1: - abstract_ps_1 - - feature_ps_pd01_port + - feature_ps_pd01_port_1 disk.device.iops_server_ps_2: - abstract_ps - disk.device.iops_ps @@ -383,40 +383,40 @@ topology_template: - disk.root.size_ps attachment_pd02_port_2: - abstract_ps - - attachment_ps_pd02_port + - attachment_ps_pd02_port_2 disk.root.size_server_ps_2: - abstract_ps - disk.root.size_ps network.outgoing.bytes.rate_pd01_port_1: - abstract_ps_1 - - network.outgoing.bytes.rate_ps_pd01_port + - network.outgoing.bytes.rate_ps_pd01_port_1 binding_pd02_port_2: - abstract_ps - - binding_ps_pd02_port + - binding_ps_pd02_port_2 network.incoming.packets.rate_pd01_port_1: - abstract_ps_1 - - network.incoming.packets.rate_ps_pd01_port + - network.incoming.packets.rate_ps_pd01_port_1 disk.usage_server_ps_1: - abstract_ps_1 - disk.usage_ps network.outpoing.packets_pd01_port_1: - abstract_ps_1 - - network.outpoing.packets_ps_pd01_port + - network.outpoing.packets_ps_pd01_port_1 disk.usage_server_ps_2: - abstract_ps - disk.usage_ps network.outpoing.packets_pd02_port_2: - abstract_ps - - network.outpoing.packets_ps_pd02_port + - network.outpoing.packets_ps_pd02_port_2 network.incoming.bytes_pd01_port_1: - abstract_ps_1 - - network.incoming.bytes_ps_pd01_port + - network.incoming.bytes_ps_pd01_port_1 network.incoming.bytes_pd02_port_2: - abstract_ps - - network.incoming.bytes_ps_pd02_port + - network.incoming.bytes_ps_pd02_port_2 network.outgoing.packets.rate_pd02_port_2: - abstract_ps - - network.outgoing.packets.rate_ps_pd02_port + - network.outgoing.packets.rate_ps_pd02_port_2 vcpus_server_ps_1: - abstract_ps_1 - vcpus_ps @@ -425,22 +425,22 @@ topology_template: - vcpus_ps forwarder_pd01_port_1: - abstract_ps_1 - - forwarder_ps_pd01_port + - forwarder_ps_pd01_port_1 forwarder_pd02_port_2: - abstract_ps - - forwarder_ps_pd02_port + - forwarder_ps_pd02_port_2 network.incoming.packets_pd01_port_1: - abstract_ps_1 - - network.incoming.packets_ps_pd01_port + - network.incoming.packets_ps_pd01_port_1 network.incoming.packets_pd02_port_2: - abstract_ps - - network.incoming.packets_ps_pd02_port + - network.incoming.packets_ps_pd02_port_2 disk.device.write.bytes.rate_server_ps_1: - abstract_ps_1 - disk.device.write.bytes.rate_ps network.incoming.bytes.rate_pd02_port_2: - abstract_ps - - network.incoming.bytes.rate_ps_pd02_port + - network.incoming.bytes.rate_ps_pd02_port_2 disk.write.requests_server_ps_1: - abstract_ps_1 - disk.write.requests_ps @@ -477,16 +477,16 @@ topology_template: requirements: dependency_pd02_port_2: - abstract_ps - - dependency_ps_pd02_port + - dependency_ps_pd02_port_2 local_storage_server_ps_2: - abstract_ps - local_storage_ps link_pd01_port_1: - abstract_ps_1 - - link_ps_pd01_port + - link_ps_pd01_port_1 link_pd02_port_2: - abstract_ps - - link_ps_pd02_port + - link_ps_pd02_port_2 local_storage_server_ps_1: - abstract_ps_1 - local_storage_ps @@ -498,4 +498,4 @@ topology_template: - dependency_ps dependency_pd01_port_1: - abstract_ps_1 - - dependency_ps_pd01_port + - dependency_ps_pd01_port_1 |