diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation | |
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/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation')
2 files changed, 323 insertions, 359 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index a6fed8e0de..c746391eb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,23 +8,17 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_ip_requirements: + port_FSB1_Internal_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: - type: list + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: + port_FSB2_Internal_2_subnetpoolid: type: string required: true status: SUPPORTED @@ -38,16 +32,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer - required: true - status: SUPPORTED port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -58,65 +42,63 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: - type: list + port_FSB2_Internal_2_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB2_Internal_2_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB2_Internal_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB1_Internal_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_exCP_naming: + port_FSB1_Internal_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_network_role: + port_FSB1_Internal_1_network_role: type: string required: true status: SUPPORTED - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_FSB1_availability_zone: + port_FSB1_Internal_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string + required: true + status: SUPPORTED + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -130,15 +112,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB1_OAM_order: - type: integer + port_FSB2_Internal_2_ip_requirements: + type: list required: true status: SUPPORTED - port_FSB2_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_mac_address: + port_FSB1_Internal_1_mac_address: type: string required: true status: SUPPORTED @@ -148,24 +132,40 @@ node_types: status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB2_Internal_2_related_networks: + type: list required: true status: SUPPORTED - port_FSB1_Internal_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_network_role: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_1_order: type: integer required: true status: SUPPORTED - port_FSB1_OAM_network_role: + port_FSB1_Internal_1_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_network: - type: list + port_FSB1_OAM_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -176,10 +176,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_FSB1_name: type: list required: true @@ -192,17 +188,15 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB2_Internal_2_network_role_tag: type: string required: true status: SUPPORTED - attributes: - FSB1_FSB2_Internal_tenant_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_network_id: - type: string + port_FSB2_Internal_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true status: SUPPORTED + attributes: FSB1_accessIPv6: type: string status: SUPPORTED @@ -214,34 +208,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB2_Internal_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB2_Internal_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB1_Internal_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB1_Internal_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -287,14 +275,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB2_Internal: - 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.capacity_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -313,6 +293,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB2_Internal_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.bytes_FSB1_FSB1_Internal_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.allocation_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -343,51 +337,42 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB1_OAM: + network.outgoing.bytes_FSB1_FSB1_Internal_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_FSB1: + network.outgoing.bytes.rate_FSB1_FSB1_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 - forwarder_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_FSB1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_Internal: + disk.root.size_FSB1: type: org.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_FSB1_FSB1_Internal: + network.incoming.packets.rate_FSB1_FSB2_Internal_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_FSB1_FSB2_Internal: + feature_FSB1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_FSB1_FSB1_Internal_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_FSB1_FSB2_Internal: + network.incoming.packets_FSB1_FSB2_Internal_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: @@ -410,17 +395,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal: - type: org.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_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -450,34 +424,39 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.outpoing.packets_FSB1_FSB2_Internal_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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB2_Internal_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 - binding_FSB1_FSB1_Internal: - 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.outgoing.bytes_FSB1_FSB2_Internal_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 - disk.device.read.requests.rate_FSB1: + cpu.delta_FSB1: type: org.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_FSB1_FSB1_Internal: - type: tosca.capabilities.Node + disk.write.bytes_FSB1: + type: org.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_FSB1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -504,6 +483,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB2_Internal_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_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -518,19 +503,25 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outpoing.packets_FSB1_FSB1_Internal_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED attachment_FSB1_FSB1_OAM: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.packets.rate_FSB1_FSB1_Internal_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + feature_FSB1_FSB1_Internal_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -552,25 +543,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_FSB1_FSB1_Internal_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal: + disk.device.read.bytes_FSB1: type: org.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_FSB1: + disk.device.usage_FSB1: type: org.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_FSB1: + network.incoming.packets_FSB1_FSB1_Internal_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: @@ -593,67 +583,66 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB1_Internal_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - host_FSB1: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.outpoing.packets_FSB1_FSB1_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.allocation_FSB1: + network.outgoing.packets.rate_FSB1_FSB1_Internal_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 - os_FSB1: - type: tosca.capabilities.OperatingSystem + network.incoming.bytes_FSB1_FSB2_Internal_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_FSB1: + network.outgoing.bytes.rate_FSB1_FSB1_Internal_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.write.requests_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_FSB1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal: + disk.device.allocation_FSB1: type: org.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_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_FSB1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal: + vcpus_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_FSB1: + disk.write.requests_FSB1: type: org.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_FSB1_FSB1_Internal: + disk.device.write.bytes.rate_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -664,27 +653,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: + network.incoming.bytes.rate_FSB1_FSB2_Internal_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB1_Internal: + disk.latency_FSB1: type: org.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_FSB1: + memory.usage_FSB1: type: org.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_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_FSB1_FSB2_Internal_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -694,31 +682,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_FSB1_FSB1_Internal_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB2_Internal: + disk.device.write.requests_FSB1: type: org.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_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_FSB1_FSB2_Internal_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.iops_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB2_Internal_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + disk.iops_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index d8e84c2056..3e537aff10 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -11,20 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true - port_FSB1_Internal_ip_requirements: + port_FSB1_Internal_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: - type: list + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: + port_FSB2_Internal_2_subnetpoolid: type: string required: true port_FSB1_OAM_subnetpoolid: @@ -35,14 +30,6 @@ topology_template: required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer - required: true port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -51,53 +38,51 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: - type: list + port_FSB2_Internal_2_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB2_Internal_2_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB2_Internal_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB1_Internal_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - port_FSB1_Internal_exCP_naming: + port_FSB1_Internal_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_network_role: + port_FSB1_Internal_1_network_role: type: string required: true - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_FSB1_availability_zone: + port_FSB1_Internal_1_related_networks: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string + required: true + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -109,13 +94,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_FSB2_Internal_2_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true - port_FSB2_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB2_Internal_mac_address: + port_FSB1_Internal_1_mac_address: type: string required: true port_FSB1_OAM_network: @@ -123,20 +110,33 @@ topology_template: required: true entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: - type: integer + port_FSB2_Internal_2_related_networks: + type: list required: true - port_FSB1_OAM_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network: + type: list required: true - port_FSB2_Internal_network: + entry_schema: + type: string + port_FSB2_Internal_2_network: type: list required: true entry_schema: type: string + port_FSB2_Internal_2_network_role: + type: string + required: true + port_FSB1_Internal_1_order: + type: integer + required: true + port_FSB1_Internal_1_subnetpoolid: + type: string + required: true + port_FSB1_OAM_network_role: + type: string + required: true port_FSB1_OAM_related_networks: type: list required: true @@ -145,9 +145,6 @@ topology_template: port_FSB1_OAM_network_role_tag: type: string required: true - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_FSB1_name: type: list required: true @@ -158,70 +155,73 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB2_Internal_2_network_role_tag: type: string required: true + port_FSB2_Internal_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB2_Internal_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB2_Internal_2_mac_requirements order: - get_input: port_FSB1_Internal_order + get_input: port_FSB2_Internal_2_order mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB2_Internal_2_mac_address exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB2_Internal_2_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB2_Internal_2_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB2_Internal_2_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB2_Internal_2_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB2_Internal_2_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB2_Internal_2_network_role subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB2_Internal_2_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB2_Internal_2_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB1_Internal_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB1_Internal_1_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB1_Internal_1_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB1_Internal_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB1_Internal_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB1_Internal_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB1_Internal_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB1_Internal_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB1_Internal_1_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB1_Internal_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB1_Internal_1_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB1_Internal_1_network - index_value requirements: - binding: @@ -288,18 +288,6 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - network_id FSB1_accessIPv6: type: string value: @@ -320,18 +308,6 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - network_id - FSB1_FSB1_Internal_device_owner: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: @@ -341,9 +317,6 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding disk.capacity_FSB1: - FSB1 - disk.capacity @@ -353,6 +326,12 @@ topology_template: disk.device.latency_FSB1: - FSB1 - disk.device.latency + binding_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - binding + network.incoming.bytes_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes disk.allocation_FSB1: - FSB1 - disk.allocation @@ -368,32 +347,26 @@ topology_template: disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outgoing.bytes_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.bytes network.outgoing.bytes.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes.rate disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder + network.incoming.packets.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.incoming.packets.rate feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - feature_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - feature - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment - network.incoming.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.incoming.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes.rate + network.incoming.packets_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 - network.incoming.packets forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM @@ -404,12 +377,6 @@ topology_template: network.incoming.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets.rate - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder - network.incoming.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -425,21 +392,24 @@ topology_template: disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate + network.outpoing.packets_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outpoing.packets + network.outgoing.bytes.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outgoing.bytes.rate + network.outgoing.bytes_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outgoing.bytes cpu.delta_FSB1: - FSB1 - cpu.delta disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests @@ -452,21 +422,27 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes + network.outgoing.packets.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.outgoing.packets.rate network.outgoing.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.packets.rate binding_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - binding + network.outpoing.packets_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outpoing.packets attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment + network.incoming.packets.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.packets.rate + feature_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - feature network.incoming.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes @@ -476,18 +452,18 @@ topology_template: network.incoming.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.packets - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes.rate + forwarder_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - forwarder disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes disk.device.usage_FSB1: - FSB1 - disk.device.usage + network.incoming.packets_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.packets disk.write.bytes.rate_FSB1: - FSB1 - disk.write.bytes.rate @@ -497,9 +473,21 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + attachment_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - attachment network.outpoing.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outpoing.packets + network.outgoing.packets.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.packets.rate + network.incoming.bytes_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - network.incoming.bytes + network.outgoing.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.bytes.rate host_FSB1: - FSB1 - host @@ -515,29 +503,14 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes - network.outpoing.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outpoing.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes.rate_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 - network.incoming.bytes.rate disk.latency_FSB1: - FSB1 @@ -545,28 +518,37 @@ topology_template: memory.usage_FSB1: - FSB1 - memory.usage + feature_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - feature disk.read.requests_FSB1: - FSB1 - disk.read.requests + binding_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - binding disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes.rate - network.incoming.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes + forwarder_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - forwarder + attachment_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - attachment disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: + link_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - link + link_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - link link_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - link @@ -576,18 +558,12 @@ topology_template: dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + dependency_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - dependency + dependency_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 - dependency |