diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate')
17 files changed, 2120 insertions, 2228 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml index 6755ef4b77..9d1263448b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml @@ -287,7 +287,7 @@ topology_template: type: string description: Internal1_external node_templates: - FSB2_Internal_2: + FSB_1_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 - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -412,7 +412,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_1_Internal_port_0 + - FSB_1_Internal_port_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/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml index 42008cf2fd..ac0f7726a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,14 @@ 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: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED port_FSB1_OAM_subnetpoolid: @@ -38,85 +28,81 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string required: true status: SUPPORTED port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_FSB_Internal_port_0_mac_address: + type: string + required: true + status: SUPPORTED port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: 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 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_FSB_Internal_port_0_ip_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: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_availability_zone: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -134,38 +120,38 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -176,61 +162,75 @@ 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 status: SUPPORTED entry_schema: type: string + port_FSB_Internal_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_FSB1_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB1_OAM: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_OAM: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -263,13 +263,29 @@ 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 + network.outgoing.packets.rate_FSB1_FSB_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: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_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: type: org.openecomp.capabilities.metric.Ceilometer @@ -283,6 +299,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED 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. @@ -331,128 +357,110 @@ node_types: 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: - 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_OAM: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB1_Internal: + 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 - feature_FSB1_FSB2_Internal: - type: tosca.capabilities.Node + 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 - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + 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 - network.incoming.packets_FSB1_FSB2_Internal: + 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 - forwarder_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.Forwarder + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_FSB1: + 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.incoming.packets.rate_FSB1_FSB1_OAM: + 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 - forwarder_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal: + 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_FSB1: + 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.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. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_OAM: - type: tosca.capabilities.Node + network.incoming.bytes.rate_FSB1_FSB_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 - instance_FSB1: + 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 - 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. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_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_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 - occurrences: - - 0 - - UNBOUNDED - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -463,6 +471,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.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. @@ -499,42 +512,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_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_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_FSB1: + network.incoming.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 - network.incoming.packets_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_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.outpoing.packets_FSB1_FSB1_Internal: + memory_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: + network.incoming.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: @@ -569,6 +583,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_FSB1_FSB_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: + - 0 + - 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. @@ -605,19 +635,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.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. - 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. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -629,29 +647,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_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. - occurrences: - - 1 - - UNBOUNDED endpoint_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_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. - 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. @@ -670,19 +670,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_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: + network.incoming.packets.rate_FSB1_FSB_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: @@ -694,7 +694,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index 99e7fd0762..0739631901 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -11,21 +11,13 @@ 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: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true port_FSB1_OAM_subnetpoolid: type: string @@ -35,69 +27,66 @@ topology_template: required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string required: true port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_FSB_Internal_port_0_mac_address: + type: string + required: true port_FSB1_OAM_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_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: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_FSB1_availability_zone: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -112,31 +101,31 @@ topology_template: port_FSB1_OAM_order: type: integer required: true - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string - required: true port_FSB1_OAM_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: + port_FSB_Internal_port_0_order: type: integer required: true + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_FSB1_OAM_network_role: type: string required: true - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -145,118 +134,129 @@ 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 entry_schema: type: string + port_FSB_Internal_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_FSB1_OAM_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_1_network: + type: list + required: true + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB1_Internal_order - mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB1_OAM_order exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB1_OAM_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB1_OAM_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB1_OAM_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB1_OAM_network_role + fixed_ips: + get_input: + - port_FSB1_OAM_fixed_ips + - index_value subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB1_OAM_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB1_OAM: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_OAM_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB1_OAM_order + get_input: port_FSB_Internal_port_0_order + mac_address: + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB1_OAM_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB1_OAM_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_OAM_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB1_OAM_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB1_OAM_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB1_OAM_network_role - fixed_ips: - get_input: - - port_FSB1_OAM_fixed_ips - - index_value + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid network: get_input: - - port_FSB1_OAM_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -296,15 +296,30 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -329,27 +344,9 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder 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.packets forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - forwarder @@ -359,12 +356,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 @@ -386,18 +377,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -416,27 +425,27 @@ topology_template: attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment network.incoming.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets memory_FSB1: - FSB1 - memory 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 disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -452,6 +461,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding network.outpoing.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outpoing.packets @@ -470,30 +485,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - 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 disk.latency_FSB1: - FSB1 - disk.latency @@ -503,21 +503,21 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate 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 + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops @@ -528,21 +528,21 @@ topology_template: dependency_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - dependency + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml index f7c9292c6a..8ccf596a8a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: network: Internal2-net @@ -115,7 +115,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -125,7 +125,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -140,7 +140,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -161,7 +161,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -169,11 +169,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -258,8 +258,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB_2_Internal_port_1,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -269,8 +269,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_2_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack @@ -279,9 +279,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 - - FSB1_Internal_1 - - FSB1_Internal_2 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 - FSB1_template - FSB2_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/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 316771995c..65fe7d2736 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,14 @@ 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: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED compute_FSB1_metadata: @@ -34,65 +24,61 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: + type: string + port_FSB_Internal_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_0_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: + port_FSB_Internal_port_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB_Internal_port_0_ip_requirements: + type: list required: true status: SUPPORTED - compute_FSB1_availability_zone: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -106,47 +92,61 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_exCP_naming: + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB2_Internal_network: + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_name: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED attributes: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string status: SUPPORTED - FSB1_FSB1_Internal_network_id: + FSB1_FSB_1_Internal_port_1_device_owner: type: string status: SUPPORTED FSB1_user_data_format: @@ -160,37 +160,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_status: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -211,13 +202,29 @@ node_types: - 0 - UNBOUNDED capabilities: - 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 + network.outgoing.packets.rate_FSB1_FSB_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: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_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: type: org.openecomp.capabilities.metric.Ceilometer @@ -231,6 +238,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED 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. @@ -273,112 +290,94 @@ node_types: 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: + 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 - network.outgoing.bytes_FSB1_FSB1_Internal: + 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 - feature_FSB1_FSB2_Internal: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + 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.incoming.packets_FSB1_FSB2_Internal: + 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 - memory.resident_FSB1: + 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 - forwarder_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder + 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 - network.incoming.packets.rate_FSB1_FSB2_Internal: + 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 - 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. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_FSB1: + network.incoming.bytes.rate_FSB1_FSB_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 - instance_FSB1: + 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 - 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. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_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_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 - occurrences: - - 0 - - UNBOUNDED - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -389,6 +388,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.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. @@ -406,30 +410,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_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_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_FSB1: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_Internal: + network.incoming.packets_FSB1_FSB_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.rate_FSB1_FSB2_Internal: + memory_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: @@ -464,6 +469,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_FSB1_FSB_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: + - 0 + - UNBOUNDED host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -494,19 +515,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.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. - 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. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -518,29 +527,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_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. - occurrences: - - 1 - - UNBOUNDED endpoint_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_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. - 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. @@ -559,19 +550,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_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: + network.incoming.packets.rate_FSB1_FSB_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: @@ -583,7 +574,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml index aa9a7167f6..83b377cf40 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml @@ -11,74 +11,63 @@ 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: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string + required: true + port_FSB_Internal_port_0_mac_address: + type: string required: true - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_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: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true - compute_FSB1_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -90,95 +79,106 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string + port_FSB_Internal_port_0_order: + type: integer + required: true + port_FSB_Internal_port_1_ip_requirements: + type: list required: true - port_FSB2_Internal_exCP_naming: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role_tag: + type: string required: true - port_FSB2_Internal_network: + compute_FSB1_name: type: list required: true entry_schema: type: string - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_FSB1_name: + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_1_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB1_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB_Internal_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_0_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -210,18 +210,18 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string value: get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: + - FSB1_FSB_1_Internal_port_1 + - network_id + FSB1_FSB_1_Internal_port_1_device_owner: type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id + - FSB1_FSB_1_Internal_port_1 + - device_owner FSB1_user_data_format: type: string value: @@ -242,36 +242,33 @@ 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_status: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - status - 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: - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -293,36 +290,12 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder 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.packets memory.resident_FSB1: - FSB1 - memory.resident - 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 @@ -341,18 +314,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -362,21 +353,21 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment memory_FSB1: - FSB1 - memory - 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 disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -392,6 +383,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding host_FSB1: - FSB1 - host @@ -407,30 +404,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - 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 disk.latency_FSB1: - FSB1 - disk.latency @@ -440,40 +422,40 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate 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 + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml index d8a7a103fd..c99b60175a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: network: Internal2-net @@ -116,7 +116,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -126,12 +126,12 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: get_input: fsb1-Internal1-mac - network: {get_attribute: [FSB2_Internal_1, att]} + network: {get_attribute: [FSB_2_Internal_port_0, att]} requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -141,12 +141,12 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: get_input: fsb1-Internal1-mac - network: {get_attribute: [FSB2_Internal_1, att]} + network: {get_attribute: [FSB_2_Internal_port_0, att]} requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -162,7 +162,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -170,11 +170,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -239,7 +239,7 @@ topology_template: availability_zone: get_input: fsb_zone name: - get_attribute: [FSB1_Internal_1, name] + get_attribute: [FSB_1_Internal_port_1, name] artifacts: nimbus-ethernet-gw: type: tosca.artifacts.Deployment @@ -259,8 +259,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB_2_Internal_port_1,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -270,8 +270,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_2_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack @@ -280,9 +280,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 - - FSB1_Internal_1 - - FSB1_Internal_2 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 - FSB1_template - FSB2_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/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index f20b53326b..1a7ae59586 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,14 @@ 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: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED compute_FSB1_metadata: @@ -34,58 +24,60 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: + type: string + port_FSB_Internal_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_0_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_mac_address: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB_Internal_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_FSB1_availability_zone: type: list required: true @@ -100,47 +92,55 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_exCP_naming: + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB2_Internal_network: + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_name: - type: list + port_FSB_Internal_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED attributes: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string status: SUPPORTED - FSB1_FSB1_Internal_network_id: + FSB1_FSB_1_Internal_port_1_device_owner: type: string status: SUPPORTED FSB1_user_data_format: @@ -154,37 +154,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_status: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -205,13 +196,29 @@ node_types: - 0 - UNBOUNDED capabilities: - 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 + network.outgoing.packets.rate_FSB1_FSB_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: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_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: type: org.openecomp.capabilities.metric.Ceilometer @@ -225,6 +232,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED 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. @@ -267,112 +284,94 @@ node_types: 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: + 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 - network.outgoing.bytes_FSB1_FSB1_Internal: + 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 - feature_FSB1_FSB2_Internal: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + 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.incoming.packets_FSB1_FSB2_Internal: + 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 - memory.resident_FSB1: + 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 - forwarder_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder + 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 - network.incoming.packets.rate_FSB1_FSB2_Internal: + 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 - 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. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_FSB1: + network.incoming.bytes.rate_FSB1_FSB_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 - instance_FSB1: + 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 - 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. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_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_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 - occurrences: - - 0 - - UNBOUNDED - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -383,6 +382,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.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. @@ -400,30 +404,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_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_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_FSB1: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_Internal: + network.incoming.packets_FSB1_FSB_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.rate_FSB1_FSB2_Internal: + memory_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: @@ -458,6 +463,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_FSB1_FSB_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: + - 0 + - UNBOUNDED host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -488,19 +509,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.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. - 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. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -512,29 +521,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_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. - occurrences: - - 1 - - UNBOUNDED endpoint_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_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. - 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. @@ -553,19 +544,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_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: + network.incoming.packets.rate_FSB1_FSB_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: @@ -577,7 +568,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml index 3e648300da..f18caf42b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml @@ -11,68 +11,62 @@ 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: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string + required: true + port_FSB_Internal_port_0_mac_address: + type: string required: true - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string + port_FSB_Internal_port_0_ip_requirements: + type: list required: true - port_FSB1_Internal_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_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: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true compute_FSB1_availability_zone: type: list required: true @@ -85,99 +79,105 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string - required: true - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: + port_FSB_Internal_port_0_order: type: integer required: true - port_FSB2_Internal_network: + port_FSB_Internal_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_0_network_role_tag: + type: string required: true compute_FSB1_name: type: list required: true entry_schema: type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB1_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_attribute: - - FSB1_FSB2_Internal + - FSB1_FSB_2_Internal_port_0 - att requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_0_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid device_id: get_attribute: - FSB1 - att network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -199,7 +199,7 @@ topology_template: - index_value name: get_attribute: - - FSB1_FSB1_Internal + - FSB1_FSB_1_Internal_port_1 - name artifacts: nimbus-ethernet-gw: @@ -209,18 +209,18 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string value: get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: + - FSB1_FSB_1_Internal_port_1 + - network_id + FSB1_FSB_1_Internal_port_1_device_owner: type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id + - FSB1_FSB_1_Internal_port_1 + - device_owner FSB1_user_data_format: type: string value: @@ -241,36 +241,33 @@ 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_status: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - status - 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: - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -292,36 +289,12 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder 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.packets memory.resident_FSB1: - FSB1 - memory.resident - 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 @@ -340,18 +313,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -361,21 +352,21 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment memory_FSB1: - FSB1 - memory - 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 disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -391,6 +382,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding host_FSB1: - FSB1 - host @@ -406,30 +403,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - 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 disk.latency_FSB1: - FSB1 - disk.latency @@ -439,40 +421,40 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate 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 + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml index f80a76a708..5c1c77bb46 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml @@ -287,7 +287,7 @@ topology_template: type: string description: Internal1_external node_templates: - FSB2_Internal_2: + FSB_1_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 - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -335,7 +335,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -343,11 +343,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -355,11 +355,11 @@ topology_template: flavor: get_input: fsb1-flavor availability_zone: - get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [FSB1_Internal_1, index] ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [FSB_1_Internal_port_1, index] ] metadata: - get_attribute: [ FSB1_Internal_1, myAttr, get_input: index ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_input: index ] name: - get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [jsa_net1, index] ] + get_attribute: [ FSB_1_Internal_port_1, myAttr, get_attribute: [jsa_net1, index] ] artifacts: nimbus-ethernet-gw: type: tosca.artifacts.Deployment @@ -379,8 +379,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -395,7 +395,7 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB1_Internal_1 + - FSB_1_Internal_port_0 + - FSB_1_Internal_port_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/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 647db5b03f..bc1bf735a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,108 +8,94 @@ 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_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: + port_FSB1_OAM_subnetpoolid: type: string required: true status: SUPPORTED - port_FSB1_OAM_subnetpoolid: + port_FSB_Internal_port_1_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + port_FSB_Internal_port_1_network_role_tag: + type: string required: true status: SUPPORTED + port_FSB_Internal_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_FSB_Internal_port_0_mac_address: + type: string + required: true + status: SUPPORTED port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: 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 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_FSB_Internal_port_0_ip_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: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB1_Internal_network: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -122,38 +108,38 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -164,7 +150,7 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED @@ -174,15 +160,29 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB_Internal_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED attributes: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string status: SUPPORTED - FSB1_FSB1_Internal_network_id: + FSB1_FSB_1_Internal_port_1_device_owner: type: string status: SUPPORTED FSB1_accessIPv6: @@ -196,47 +196,41 @@ 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_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB1_OAM: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_OAM: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -269,13 +263,29 @@ 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 + network.outgoing.packets.rate_FSB1_FSB_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: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_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: type: org.openecomp.capabilities.metric.Ceilometer @@ -289,6 +299,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED 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. @@ -337,128 +357,110 @@ node_types: 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: - 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_OAM: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB1_Internal: + 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 - feature_FSB1_FSB2_Internal: - type: tosca.capabilities.Node + 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 - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + 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 - network.incoming.packets_FSB1_FSB2_Internal: + 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 - forwarder_FSB1_FSB1_OAM: - type: org.openecomp.capabilities.Forwarder + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_FSB1: + 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.incoming.packets.rate_FSB1_FSB1_OAM: + 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 - forwarder_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal: + 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_FSB1: + 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.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. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_OAM: - type: tosca.capabilities.Node + network.incoming.bytes.rate_FSB1_FSB_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 - instance_FSB1: + 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 - 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. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_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_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 - occurrences: - - 0 - - UNBOUNDED - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -469,6 +471,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.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. @@ -505,42 +512,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_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_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_FSB1: + network.incoming.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 - network.incoming.packets_FSB1_FSB1_OAM: + network.incoming.packets_FSB1_FSB_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.outpoing.packets_FSB1_FSB1_Internal: + memory_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: + network.incoming.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: @@ -575,6 +583,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_FSB1_FSB_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: + - 0 + - 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. @@ -611,19 +635,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.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. - 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. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -635,29 +647,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_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. - occurrences: - - 1 - - UNBOUNDED endpoint_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_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. - 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. @@ -676,19 +670,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_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: + network.incoming.packets.rate_FSB1_FSB_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: @@ -700,7 +694,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml index 33e1cb9752..0c023468a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -11,87 +11,76 @@ 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: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true port_FSB1_OAM_subnetpoolid: type: string required: true - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_1_network_role_tag: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer - required: true + type: string port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_FSB_Internal_port_0_mac_address: + type: string + required: true port_FSB1_OAM_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string - required: true port_FSB1_OAM_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + port_FSB_Internal_port_0_ip_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: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB1_Internal_network: + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -102,31 +91,31 @@ topology_template: port_FSB1_OAM_order: type: integer required: true - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string - required: true port_FSB1_OAM_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: + port_FSB_Internal_port_0_order: type: integer required: true + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_FSB1_OAM_network_role: type: string required: true - port_FSB2_Internal_network: - type: list + port_FSB_Internal_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string port_FSB1_OAM_related_networks: type: list required: true @@ -135,7 +124,7 @@ topology_template: port_FSB1_OAM_network_role_tag: type: string required: true - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true port_FSB1_OAM_fixed_ips: @@ -143,105 +132,116 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_network: + type: list + required: true + entry_schema: + type: string + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB1_Internal_order - mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB1_OAM_order exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB1_OAM_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB1_OAM_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB1_OAM_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB1_OAM_network_role + fixed_ips: + get_input: + - port_FSB1_OAM_fixed_ips + - index_value subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid network: get_input: - - port_FSB1_Internal_network + - port_FSB1_OAM_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB1_OAM: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_OAM_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB1_OAM_order + get_input: port_FSB_Internal_port_0_order + mac_address: + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB1_OAM_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB1_OAM_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_OAM_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB1_OAM_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB1_OAM_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB1_OAM_network_role - fixed_ips: - get_input: - - port_FSB1_OAM_fixed_ips - - index_value + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid network: get_input: - - port_FSB1_OAM_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -253,10 +253,10 @@ topology_template: properties: availability_zone: get_attribute: - - FSB1_FSB1_Internal + - FSB1_FSB_1_Internal_port_1 - myAttr - get_attribute: - - FSB1_FSB1_Internal + - FSB1_FSB_1_Internal_port_1 - index flavor: get_input: vm_flavor_name @@ -268,18 +268,18 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string value: get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: + - FSB1_FSB_1_Internal_port_1 + - network_id + FSB1_FSB_1_Internal_port_1_device_owner: type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id + - FSB1_FSB_1_Internal_port_1 + - device_owner FSB1_accessIPv6: type: string value: @@ -300,18 +300,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: @@ -321,15 +309,30 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -354,27 +357,9 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder 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.packets forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - forwarder @@ -384,12 +369,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 @@ -411,18 +390,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -441,27 +438,27 @@ topology_template: attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment network.incoming.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets memory_FSB1: - FSB1 - memory 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 disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -477,6 +474,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding network.outpoing.packets_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outpoing.packets @@ -495,30 +498,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - 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 disk.latency_FSB1: - FSB1 - disk.latency @@ -528,21 +516,21 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate 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 + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops @@ -553,21 +541,21 @@ topology_template: dependency_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - dependency + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link |