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/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType | |
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/NoOutParamDuplicatePortType')
3 files changed, 483 insertions, 483 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml index 98e3bacbad..0673c7c66a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml @@ -287,7 +287,7 @@ topology_template: type: string description: Internal1_external node_templates: - FSB2_Internal_2: + FSB1_0_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -298,7 +298,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB1_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -423,8 +423,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 + - FSB1_0_Internal_port_0 + - FSB1_1_Internal_port_0 - FSB1_Internal_1 - FSB1_OAM - FSB1_template
\ 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/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 793c3bdd7c..ec3577ad8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,120 +8,116 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_ip_requirements: + compute_FSB1_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal_subnetpoolid: + type: json + port_FSB1_0_Internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_subnetpoolid: + vm_flavor_name: type: string required: true status: SUPPORTED - compute_FSB1_metadata: + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_FSB2_Internal_2_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_1_Internal_port_0_network: + type: list required: true status: SUPPORTED - vm_flavor_name: - type: string + entry_schema: + type: string + port_FSB1_0_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_related_networks: - type: list + port_FSB1_1_Internal_port_0_mac_address: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_OAM_vlan_requirements: + port_FSB1_0_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: - type: list + port_FSB1_1_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network: + port_FSB1_Internal_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB2_Internal_1_order: - type: integer + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB2_Internal_2_ip_requirements: - type: list + port_FSB1_1_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_2_related_networks: - type: list + port_FSB1_1_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB2_Internal_1_network: + port_FSB1_Internal_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string + port_FSB1_0_Internal_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_network_role: + port_FSB1_1_Internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_network_role_tag: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_mac_address: - type: string + port_FSB1_1_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_1_Internal_port_0_order: + type: integer required: true status: SUPPORTED port_FSB1_OAM_exCP_naming: @@ -134,44 +130,50 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_1_mac_address: + port_FSB1_1_Internal_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_mac_address: + port_FSB1_0_Internal_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_ip_requirements: + port_FSB1_0_Internal_port_0_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB1_0_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: + type: string + port_FSB1_1_Internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_exCP_naming: + port_FSB1_0_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB2_Internal_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_network_role: + type: string required: true status: SUPPORTED compute_FSB1_availability_zone: @@ -188,36 +190,36 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB1_OAM_order: - type: integer + port_FSB1_0_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_1_vlan_requirements: + port_FSB1_1_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_2_network: - type: list + port_FSB1_OAM_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_1_network_role_tag: + port_FSB1_Internal_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_order: + port_FSB1_0_Internal_port_0_order: type: integer required: true status: SUPPORTED - port_FSB2_Internal_1_related_networks: - type: list + port_FSB1_Internal_1_order: + type: integer + required: true + status: SUPPORTED + port_FSB1_Internal_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_related_networks: type: list required: true @@ -228,10 +230,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 @@ -244,45 +242,34 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_0_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - - dependency_FSB1_FSB1_Internal: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_FSB1_FSB2_Internal_1: + - dependency_FSB1_FSB1_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal_1: + - link_FSB1_FSB1_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal_2: + - dependency_FSB1_FSB1_Internal_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal_2: + - link_FSB1_FSB1_Internal_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -315,6 +302,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_FSB1_FSB1_0_Internal_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_FSB1_FSB1_0_Internal_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: network.incoming.bytes.rate_FSB1_FSB1_OAM: type: org.openecomp.capabilities.metric.Ceilometer @@ -322,217 +322,199 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB1_OAM: + network.outgoing.packets.rate_FSB1_FSB1_1_Internal_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.capacity_FSB1: + network.outgoing.bytes_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.read.bytes.rate_FSB1: + network.incoming.bytes.rate_FSB1_FSB1_1_Internal_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.latency_FSB1: + network.outgoing.bytes_FSB1_FSB1_1_Internal_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 - 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 - binding_FSB1_FSB2_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: - - 0 - - UNBOUNDED - disk.allocation_FSB1: + 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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_FSB1: + disk.read.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: - 1 - UNBOUNDED - disk.device.capacity_FSB1: + network.outgoing.bytes.rate_FSB1_FSB1_1_Internal_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_util_FSB1: + disk.device.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.device.write.requests.rate_FSB1: + 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 - network.outgoing.bytes.rate_FSB1_FSB1_OAM: + 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. occurrences: - 1 - UNBOUNDED - disk.root.size_FSB1: + disk.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 - network.incoming.packets.rate_FSB1_FSB2_Internal_2: + disk.device.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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal_1: + forwarder_FSB1_FSB1_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + cpu_util_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: - type: tosca.capabilities.Node + disk.device.write.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 - network.incoming.packets.rate_FSB1_FSB1_Internal: + network.outpoing.packets_FSB1_FSB1_1_Internal_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.bytes_FSB1_FSB1_Internal: + 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 - network.incoming.packets_FSB1_FSB2_Internal_1: + 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 - network.incoming.packets_FSB1_FSB2_Internal_2: + 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 - forwarder_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.Forwarder + feature_FSB1_FSB1_0_Internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_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: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_OAM: + 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 - forwarder_FSB1_FSB1_Internal: + forwarder_FSB1_FSB1_OAM: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_FSB1: + memory.resident_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.write.requests.rate_FSB1: + network.incoming.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. occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_OAM: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - instance_FSB1: + 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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_FSB1: + disk.write.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 - 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. + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal_1: + instance_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_FSB2_Internal_2: + disk.device.read.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: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_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. + feature_FSB1_FSB1_1_Internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal_2: + 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 - cpu.delta_FSB1: + network.incoming.packets.rate_FSB1_FSB1_0_Internal_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.outpoing.packets_FSB1_FSB2_Internal_1: + network.outgoing.packets.rate_FSB1_FSB1_0_Internal_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: @@ -544,7 +526,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB1_Internal: + binding_FSB1_FSB1_0_Internal_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -558,11 +540,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_Internal: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.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. @@ -586,13 +563,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_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.outgoing.packets.rate_FSB1_FSB2_Internal_2: + network.incoming.bytes.rate_FSB1_FSB1_0_Internal_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: @@ -612,19 +583,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 @@ -646,9 +623,8 @@ 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 @@ -664,6 +640,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_FSB1_FSB1_0_Internal_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_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.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. @@ -675,25 +663,41 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_FSB1_FSB1_0_Internal_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.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 + attachment_FSB1_FSB1_Internal_1: + type: tosca.capabilities.Attachment + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB2_Internal_1: + 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 - network.incoming.bytes_FSB1_FSB2_Internal_2: + attachment_FSB1_FSB1_0_Internal_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + 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: @@ -717,68 +721,63 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_FSB1: + network.incoming.bytes_FSB1_FSB1_0_Internal_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_FSB1: + 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 - network.incoming.bytes_FSB1_FSB1_Internal: + 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 - disk.device.write.bytes.rate_FSB1: + network.outgoing.bytes_FSB1_FSB1_0_Internal_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.bytes.rate_FSB1_FSB1_Internal: + network.incoming.packets_FSB1_FSB1_1_Internal_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 - endpoint_FSB1: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.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: - 1 - UNBOUNDED - 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. + endpoint_FSB1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB2_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. + binding_FSB1_FSB1_1_Internal_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: - - 1 + - 0 - 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: - 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_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -788,40 +787,46 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB2_Internal_2: - type: tosca.capabilities.Node + forwarder_FSB1_FSB1_0_Internal_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.read.requests_FSB1: + network.outpoing.packets_FSB1_FSB1_0_Internal_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.write.requests_FSB1: + network.incoming.bytes_FSB1_FSB1_1_Internal_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 - attachment_FSB1_FSB2_Internal_1: - type: tosca.capabilities.Attachment + disk.read.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 - forwarder_FSB1_FSB2_Internal_2: - type: org.openecomp.capabilities.Forwarder + 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 - feature_FSB1_FSB2_Internal_1: - type: tosca.capabilities.Node + 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 - attachment_FSB1_FSB2_Internal_2: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_FSB1_FSB1_1_Internal_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 @@ -831,11 +836,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml index 20ecc5780f..d30822dae7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml @@ -11,97 +11,94 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal_subnetpoolid: - type: string - required: true - port_FSB2_Internal_2_subnetpoolid: - type: string - required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB2_Internal_2_order: - type: integer + port_FSB1_0_Internal_port_0_subnetpoolid: + type: string required: true vm_flavor_name: type: string required: true - port_FSB1_Internal_related_networks: - type: list + port_FSB1_Internal_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB1_1_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network: + type: string + port_FSB1_0_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB1_1_Internal_port_0_mac_address: + type: string + required: true + port_FSB1_0_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal_1_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_1_Internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_2_ip_requirements: + port_FSB1_Internal_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_network_role_tag: + type: string + required: true + port_FSB1_1_Internal_port_0_network_role: + type: string + required: true port_FSB1_OAM_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_2_related_networks: - type: list + port_FSB1_1_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB2_Internal_1_network: + port_FSB1_Internal_1_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string + port_FSB1_0_Internal_port_0_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_network_role: type: string required: true - port_FSB2_Internal_1_network_role: - type: string - required: true - port_FSB2_Internal_2_network_role_tag: - type: string - required: true - port_FSB2_Internal_1_subnetpoolid: + port_FSB1_1_Internal_port_0_subnetpoolid: type: string required: true - port_FSB1_Internal_mac_address: - type: string + port_FSB1_1_Internal_port_0_related_networks: + type: list required: true - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB1_Internal_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_subnetpoolid: type: string required: true - port_FSB2_Internal_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_1_Internal_port_0_order: + type: integer required: true port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming @@ -111,36 +108,41 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_1_mac_address: + port_FSB1_1_Internal_port_0_network_role_tag: type: string required: true - port_FSB2_Internal_2_mac_address: + port_FSB1_0_Internal_port_0_network_role_tag: type: string required: true - port_FSB2_Internal_1_ip_requirements: + port_FSB1_0_Internal_port_0_mac_address: + type: string + required: true + port_FSB1_0_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: + type: string + port_FSB1_1_Internal_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB1_Internal_exCP_naming: + port_FSB1_0_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB2_Internal_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_vlan_requirements: + type: list required: true - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_FSB1_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_1_network_role: + type: string required: true compute_FSB1_availability_zone: type: list @@ -154,30 +156,29 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB1_OAM_order: - type: integer + port_FSB1_0_Internal_port_0_network_role: + type: string required: true - port_FSB2_Internal_1_vlan_requirements: + port_FSB1_1_Internal_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_2_network: - type: list + port_FSB1_OAM_order: + type: integer required: true - entry_schema: - type: string - port_FSB2_Internal_1_network_role_tag: + port_FSB1_Internal_1_mac_address: type: string required: true - port_FSB1_Internal_order: + port_FSB1_0_Internal_port_0_order: type: integer required: true - port_FSB2_Internal_1_related_networks: - type: list + port_FSB1_Internal_1_order: + type: integer + required: true + port_FSB1_Internal_1_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_related_networks: type: list required: true @@ -186,9 +187,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 @@ -199,103 +197,72 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_0_Internal_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: - FSB1_FSB1_Internal: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_FSB1_Internal_mac_requirements - order: - get_input: port_FSB1_Internal_order - mac_address: - get_input: port_FSB1_Internal_mac_address - exCP_naming: - get_input: port_FSB1_Internal_exCP_naming - vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements - subinterface_indicator: false - ip_requirements: - get_input: port_FSB1_Internal_ip_requirements - related_networks: - get_input: port_FSB1_Internal_related_networks - network_role_tag: - get_input: port_FSB1_Internal_network_role_tag - network_role: - get_input: port_FSB1_Internal_network_role - subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid - network: - get_input: - - port_FSB1_Internal_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: FSB1 - relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal_1: + FSB1_FSB1_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_1_mac_requirements + get_input: port_FSB1_1_Internal_port_0_mac_requirements order: - get_input: port_FSB2_Internal_1_order + get_input: port_FSB1_1_Internal_port_0_order mac_address: - get_input: port_FSB2_Internal_1_mac_address + get_input: port_FSB1_1_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB2_Internal_1_exCP_naming + get_input: port_FSB1_1_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_1_vlan_requirements + get_input: port_FSB1_1_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_1_ip_requirements + get_input: port_FSB1_1_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB2_Internal_1_related_networks + get_input: port_FSB1_1_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB2_Internal_1_network_role_tag + get_input: port_FSB1_1_Internal_port_0_network_role_tag network_role: - get_input: port_FSB2_Internal_1_network_role + get_input: port_FSB1_1_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB2_Internal_1_subnetpoolid + get_input: port_FSB1_1_Internal_port_0_subnetpoolid network: get_input: - - port_FSB2_Internal_1_network + - port_FSB1_1_Internal_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal_2: + FSB1_FSB1_Internal_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_2_mac_requirements + get_input: port_FSB1_Internal_1_mac_requirements order: - get_input: port_FSB2_Internal_2_order + get_input: port_FSB1_Internal_1_order mac_address: - get_input: port_FSB2_Internal_2_mac_address + get_input: port_FSB1_Internal_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_2_exCP_naming + get_input: port_FSB1_Internal_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_2_vlan_requirements + get_input: port_FSB1_Internal_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_2_ip_requirements + get_input: port_FSB1_Internal_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_2_related_networks + get_input: port_FSB1_Internal_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_2_network_role_tag + get_input: port_FSB1_Internal_1_network_role_tag network_role: - get_input: port_FSB2_Internal_2_network_role + get_input: port_FSB1_Internal_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_2_subnetpoolid + get_input: port_FSB1_Internal_1_subnetpoolid network: get_input: - - port_FSB2_Internal_2_network + - port_FSB1_Internal_1_network - index_value requirements: - binding: @@ -361,30 +328,72 @@ topology_template: nimbus-ethernet: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet + FSB1_FSB1_0_Internal_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_FSB1_0_Internal_port_0_mac_requirements + order: + get_input: port_FSB1_0_Internal_port_0_order + mac_address: + get_input: port_FSB1_0_Internal_port_0_mac_address + exCP_naming: + get_input: port_FSB1_0_Internal_port_0_exCP_naming + vlan_requirements: + get_input: port_FSB1_0_Internal_port_0_vlan_requirements + subinterface_indicator: false + ip_requirements: + get_input: port_FSB1_0_Internal_port_0_ip_requirements + related_networks: + get_input: port_FSB1_0_Internal_port_0_related_networks + network_role_tag: + get_input: port_FSB1_0_Internal_port_0_network_role_tag + network_role: + get_input: port_FSB1_0_Internal_port_0_network_role + subnetpoolid: + get_input: port_FSB1_0_Internal_port_0_subnetpoolid + network: + get_input: + - port_FSB1_0_Internal_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: FSB1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: network.incoming.bytes.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes.rate + network.outgoing.packets.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outgoing.packets.rate network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes + network.incoming.bytes.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outgoing.bytes disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outgoing.bytes.rate disk.device.latency_FSB1: - FSB1 - disk.device.latency - binding_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - binding - binding_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - binding + network.incoming.bytes_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes disk.allocation_FSB1: - FSB1 - disk.allocation @@ -394,39 +403,36 @@ topology_template: disk.device.capacity_FSB1: - FSB1 - disk.device.capacity + forwarder_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - forwarder cpu_util_FSB1: - FSB1 - cpu_util disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outpoing.packets_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.outpoing.packets + 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 - network.incoming.packets.rate_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.packets.rate - network.incoming.packets.rate_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.packets.rate + feature_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - feature 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 - network.incoming.packets_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.packets - network.incoming.packets_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.packets + network.incoming.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.bytes.rate forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - forwarder @@ -436,9 +442,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 cpu_FSB1: - FSB1 - cpu @@ -454,39 +457,27 @@ 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_1: - - FSB1_FSB2_Internal_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.outgoing.bytes.rate - network.outgoing.bytes_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.outgoing.bytes - network.outgoing.bytes_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.outgoing.bytes + feature_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - feature cpu.delta_FSB1: - FSB1 - cpu.delta - network.outpoing.packets_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.outpoing.packets + network.incoming.packets.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.packets.rate + network.outgoing.packets.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outgoing.packets.rate disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + binding_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 - 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 @@ -499,27 +490,27 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.outgoing.packets.rate_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.outgoing.packets.rate + network.incoming.bytes.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.bytes.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 @@ -529,33 +520,48 @@ 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 + 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_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.packets + network.incoming.packets_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.incoming.packets disk.write.bytes.rate_FSB1: - FSB1 - disk.write.bytes.rate scalable_FSB1: - FSB1 - scalable + network.outgoing.bytes.rate_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outgoing.bytes.rate 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.incoming.bytes_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.bytes - network.incoming.bytes_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.bytes + network.outgoing.packets.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.packets.rate + attachment_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - attachment + network.outgoing.bytes.rate_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 + - network.outgoing.bytes.rate host_FSB1: - FSB1 - host @@ -565,100 +571,94 @@ topology_template: os_FSB1: - FSB1 - os + network.incoming.bytes_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.incoming.bytes vcpus_FSB1: - FSB1 - vcpus disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes + network.outgoing.bytes_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outgoing.bytes + network.incoming.packets_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.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_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - network.incoming.bytes.rate - network.incoming.bytes.rate_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - network.incoming.bytes.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes.rate + binding_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - binding disk.latency_FSB1: - FSB1 - disk.latency + attachment_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - attachment memory.usage_FSB1: - FSB1 - memory.usage - feature_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - feature + forwarder_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - forwarder + network.outpoing.packets_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 + - network.outpoing.packets + network.incoming.bytes_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.bytes 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 - attachment_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - attachment - forwarder_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - forwarder - feature_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - feature - attachment_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - attachment + network.incoming.packets.rate_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - forwarder_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - forwarder disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: - link_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 + link_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 - link + dependency_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - dependency link_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - link + link_FSB1_FSB1_1_Internal_port_0: + - FSB1_FSB1_1_Internal_port_0 + - link dependency_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + link_FSB1_FSB1_0_Internal_port_0: + - FSB1_FSB1_0_Internal_port_0 - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal_2: - - FSB1_FSB2_Internal_2 - - dependency - dependency_FSB1_FSB2_Internal_1: - - FSB1_FSB2_Internal_1 + dependency_FSB1_FSB1_Internal_1: + - FSB1_FSB1_Internal_1 - dependency |