From 73d3b3812ddfa77919281af9b711a50cf3160c1f Mon Sep 17 00:00:00 2001 From: eleonorali Date: Mon, 12 Mar 2018 16:39:47 +0200 Subject: Port Mirroring: Incorrect Interfaces list(2) Defect 427115 - Port Mirroring: Incorrect Interfaces list - not correct Port Type Change-Id: I5a58f5a0acf9df455d294d2dbc0b84cb2c1e03e2 Issue-ID: SDC-1107 Signed-off-by: eleonorali --- .../in/MainServiceTemplate.yaml | 12 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 360 ++++++++++---------- .../out/SubstitutionServiceTemplate.yaml | 374 ++++++++++----------- 3 files changed, 373 insertions(+), 373 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType') 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 dc7c6e61fd..98e3bacbad 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_Internal2: + FSB2_Internal_2: 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_Internal1: + FSB2_Internal_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -309,7 +309,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal1: + FSB1_Internal_1: 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_Internal2 - - FSB2_Internal1 - - FSB1_Internal1 + - FSB2_Internal_2 + - FSB2_Internal_1 + - 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 a7b33349d1..0cc801ed3d 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 @@ -18,10 +18,18 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_FSB1_Internal_subnetpoolid: type: string required: true status: SUPPORTED + port_FSB2_Internal_2_subnetpoolid: + type: string + required: true + status: SUPPORTED port_FSB1_OAM_subnetpoolid: type: string required: true @@ -32,8 +40,8 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal2_network_role_tag: - type: string + port_FSB2_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_FSB1_OAM_exCP_naming: @@ -46,46 +54,38 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB2_Internal_2_order: + type: integer required: true status: SUPPORTED - vm_flavor_name: + port_FSB2_Internal_1_mac_address: type: string required: true status: SUPPORTED - port_FSB2_Internal2_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_flavor_name: + type: string required: true status: SUPPORTED - port_FSB2_Internal2_network_role: + port_FSB2_Internal_2_mac_address: type: string required: true status: SUPPORTED - port_FSB2_Internal1_ip_requirements: + port_FSB2_Internal_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_network_role: - type: string + port_FSB2_Internal_2_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal1_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_OAM_vlan_requirements: type: list required: true @@ -102,34 +102,18 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB1_OAM_mac_requirements: + port_FSB2_Internal_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal2_mac_address: + port_FSB1_Internal_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal2_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_FSB1_availability_zone: type: list required: true @@ -150,57 +134,61 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal2_network: + port_FSB2_Internal_1_order: + type: integer + required: true + status: SUPPORTED + port_FSB2_Internal_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true status: SUPPORTED + port_FSB2_Internal_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal2_vlan_requirements: + port_FSB2_Internal_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal1_order: - type: integer + type: string + port_FSB2_Internal_2_network: + type: list required: true status: SUPPORTED - port_FSB2_Internal2_subnetpoolid: + entry_schema: + type: string + port_FSB2_Internal_2_network_role: type: string required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer - required: true - status: SUPPORTED - port_FSB2_Internal1_network_role_tag: + port_FSB2_Internal_1_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_order: + type: integer required: true status: SUPPORTED port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal2_order: - type: integer - required: true - status: SUPPORTED - port_FSB2_Internal1_subnetpoolid: + port_FSB2_Internal_1_network_role: type: string required: true status: SUPPORTED @@ -224,6 +212,18 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - dependency_FSB1_FSB1_Internal: capability: tosca.capabilities.Node @@ -238,78 +238,66 @@ node_types: occurrences: - 1 - 1 - - dependency_FSB1_FSB1_OAM: + - dependency_FSB1_FSB2_Internal_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_OAM: + - link_FSB1_FSB2_Internal_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal2: + - dependency_FSB1_FSB2_Internal_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal2: + - link_FSB1_FSB2_Internal_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_FSB1_FSB1_OAM: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_FSB1_FSB2_Internal1: + - 1 + - 1 + - dependency_FSB1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets_FSB1_FSB2_Internal2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_FSB1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: network.incoming.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_Internal1: - type: org.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_OAM: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -334,6 +322,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 + 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 + occurrences: + - 0 + - 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. @@ -376,17 +378,23 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1: - type: tosca.capabilities.Node + 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 - network.outgoing.bytes_FSB1_FSB2_Internal1: + network.incoming.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 + 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. @@ -399,6 +407,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_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.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: + - 1 + - UNBOUNDED forwarder_FSB1_FSB1_OAM: type: org.openecomp.capabilities.Forwarder occurrences: @@ -427,13 +447,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB2_Internal1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - 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. @@ -445,13 +458,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB2_Internal2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED 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. @@ -464,13 +470,33 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_FSB1_FSB2_Internal2: - type: tosca.capabilities.Attachment + 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 - attachment_FSB1_FSB2_Internal1: - type: tosca.capabilities.Attachment + network.outgoing.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. + occurrences: + - 1 + - UNBOUNDED + 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 + 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. + occurrences: + - 1 + - UNBOUNDED + 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: - 1 - UNBOUNDED @@ -480,6 +506,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_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 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. @@ -510,12 +542,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -533,7 +559,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal1: + 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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -557,24 +589,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB2_Internal2: - type: org.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: type: org.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_Internal1: - type: org.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 occurrences: @@ -639,6 +659,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.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. + occurrences: + - 1 + - UNBOUNDED + 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 host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -669,29 +701,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB2_Internal2: - type: org.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_Internal1: - type: org.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 - forwarder_FSB1_FSB2_Internal2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED 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. @@ -704,41 +719,30 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED endpoint_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal2: - type: org.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_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.outgoing.packets.rate_FSB1_FSB2_Internal2: + 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: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal1: + 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: @@ -750,55 +754,46 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal1: - type: org.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_Internal2: + 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 - network.outgoing.bytes.rate_FSB1_FSB2_Internal1: + 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 - network.outgoing.bytes.rate_FSB1_FSB2_Internal2: + 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 - 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. + attachment_FSB1_FSB2_Internal_1: + type: tosca.capabilities.Attachment 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. + forwarder_FSB1_FSB2_Internal_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB2_Internal1: + feature_FSB1_FSB2_Internal_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB2_Internal2: - type: tosca.capabilities.Node + attachment_FSB1_FSB2_Internal_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -808,6 +803,11 @@ 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 ad54850b6d..535fa50cf3 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 @@ -19,9 +19,15 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_FSB1_Internal_subnetpoolid: type: string required: true + port_FSB2_Internal_2_subnetpoolid: + type: string + required: true port_FSB1_OAM_subnetpoolid: type: string required: true @@ -30,8 +36,8 @@ topology_template: required: true entry_schema: type: json - port_FSB2_Internal2_network_role_tag: - type: string + port_FSB2_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming @@ -41,37 +47,31 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB2_Internal_2_order: + type: integer required: true - vm_flavor_name: + port_FSB2_Internal_1_mac_address: type: string required: true - port_FSB2_Internal2_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_flavor_name: + type: string required: true - port_FSB2_Internal2_network_role: + port_FSB2_Internal_2_mac_address: type: string required: true - port_FSB2_Internal1_ip_requirements: + port_FSB2_Internal_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_network_role: - type: string - required: true - port_FSB1_Internal_network_role_tag: - type: string - required: true - port_FSB2_Internal1_mac_address: - type: string - required: true - port_FSB2_Internal1_vlan_requirements: + port_FSB2_Internal_2_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network_role_tag: + type: string + required: true port_FSB1_OAM_vlan_requirements: type: list required: true @@ -85,28 +85,15 @@ topology_template: port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_network_role: - type: string - required: true - port_FSB2_Internal1_network: - type: list - required: true - entry_schema: - type: string - port_FSB1_OAM_mac_requirements: + port_FSB2_Internal_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal2_mac_address: + port_FSB1_Internal_network_role: type: string required: true - port_FSB2_Internal2_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_FSB1_availability_zone: type: list required: true @@ -124,46 +111,50 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal2_network: + port_FSB2_Internal_1_order: + type: integer + required: true + port_FSB2_Internal_2_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_OAM_order: type: integer required: true + port_FSB2_Internal_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_OAM_network: type: list required: true entry_schema: type: string - port_FSB2_Internal2_vlan_requirements: + port_FSB2_Internal_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal1_order: - type: integer + type: string + port_FSB2_Internal_2_network: + type: list required: true - port_FSB2_Internal2_subnetpoolid: + entry_schema: + type: string + port_FSB2_Internal_2_network_role: type: string required: true - port_FSB1_Internal_order: - type: integer - required: true - port_FSB2_Internal1_network_role_tag: + port_FSB2_Internal_1_network_role_tag: type: string required: true - port_FSB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal_order: + type: integer required: true port_FSB1_OAM_network_role: type: string required: true - port_FSB2_Internal2_order: - type: integer - required: true - port_FSB2_Internal1_subnetpoolid: + port_FSB2_Internal_1_network_role: type: string required: true port_FSB1_OAM_network_role_tag: @@ -182,6 +173,15 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + port_FSB2_Internal_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true node_templates: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -213,63 +213,93 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB1_OAM: + FSB1_FSB2_Internal_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_FSB1_OAM_exCP_naming + get_input: port_FSB2_Internal_1_exCP_naming vlan_requirements: - get_input: port_FSB1_OAM_vlan_requirements + get_input: port_FSB2_Internal_1_vlan_requirements ip_requirements: - get_input: port_FSB1_OAM_ip_requirements + get_input: port_FSB2_Internal_1_ip_requirements network_role_tag: - get_input: port_FSB1_OAM_network_role_tag + get_input: port_FSB2_Internal_1_network_role_tag mac_requirements: - get_input: port_FSB1_OAM_mac_requirements + get_input: port_FSB2_Internal_1_mac_requirements order: - get_input: port_FSB1_OAM_order + get_input: port_FSB2_Internal_1_order network_role: - get_input: port_FSB1_OAM_network_role + get_input: port_FSB2_Internal_1_network_role subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid - fixed_ips: + get_input: port_FSB2_Internal_1_subnetpoolid + network: get_input: - - port_FSB1_OAM_fixed_ips + - port_FSB2_Internal_1_network - index_value + mac_address: + get_input: port_FSB2_Internal_1_mac_address + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: FSB1 + relationship: tosca.relationships.network.BindsTo + FSB1_FSB2_Internal_2: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_FSB2_Internal_2_exCP_naming + vlan_requirements: + get_input: port_FSB2_Internal_2_vlan_requirements + ip_requirements: + get_input: port_FSB2_Internal_2_ip_requirements + network_role_tag: + get_input: port_FSB2_Internal_2_network_role_tag + mac_requirements: + get_input: port_FSB2_Internal_2_mac_requirements + order: + get_input: port_FSB2_Internal_2_order + network_role: + get_input: port_FSB2_Internal_2_network_role + subnetpoolid: + get_input: port_FSB2_Internal_2_subnetpoolid network: get_input: - - port_FSB1_OAM_network + - port_FSB2_Internal_2_network - index_value + mac_address: + get_input: port_FSB2_Internal_2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal2: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_FSB2_Internal2_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal2_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements ip_requirements: - get_input: port_FSB2_Internal2_ip_requirements + get_input: port_FSB1_OAM_ip_requirements network_role_tag: - get_input: port_FSB2_Internal2_network_role_tag + get_input: port_FSB1_OAM_network_role_tag mac_requirements: - get_input: port_FSB2_Internal2_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB2_Internal2_order + get_input: port_FSB1_OAM_order network_role: - get_input: port_FSB2_Internal2_network_role + get_input: port_FSB1_OAM_network_role subnetpoolid: - get_input: port_FSB2_Internal2_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid + fixed_ips: + get_input: + - port_FSB1_OAM_fixed_ips + - index_value network: get_input: - - port_FSB2_Internal2_network + - port_FSB1_OAM_network - index_value - mac_address: - get_input: port_FSB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -299,48 +329,12 @@ topology_template: nimbus-ethernet: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet - FSB1_FSB2_Internal1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - exCP_naming: - get_input: port_FSB2_Internal1_exCP_naming - vlan_requirements: - get_input: port_FSB2_Internal1_vlan_requirements - ip_requirements: - get_input: port_FSB2_Internal1_ip_requirements - network_role_tag: - get_input: port_FSB2_Internal1_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal1_mac_requirements - order: - get_input: port_FSB2_Internal1_order - network_role: - get_input: port_FSB2_Internal1_network_role - subnetpoolid: - get_input: port_FSB2_Internal1_subnetpoolid - network: - get_input: - - port_FSB2_Internal1_network - - index_value - mac_address: - get_input: port_FSB2_Internal1_mac_address - 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.packets_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - network.incoming.packets network.incoming.bytes.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.incoming.bytes.rate - network.incoming.packets_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.incoming.packets network.outgoing.bytes_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.bytes @@ -353,6 +347,12 @@ topology_template: 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 disk.allocation_FSB1: - FSB1 - disk.allocation @@ -374,18 +374,27 @@ topology_template: 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 - feature - network.outgoing.bytes_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.outgoing.bytes 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 forwarder_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - forwarder @@ -401,33 +410,39 @@ topology_template: cpu_FSB1: - FSB1 - cpu - binding_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - binding disk.write.requests.rate_FSB1: - FSB1 - disk.write.requests.rate feature_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - feature - binding_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - binding instance_FSB1: - FSB1 - instance disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate - attachment_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - attachment - attachment_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - attachment + 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 cpu.delta_FSB1: - FSB1 - cpu.delta + network.outpoing.packets_FSB1_FSB2_Internal_1: + - FSB1_FSB2_Internal_1 + - network.outpoing.packets disk.write.bytes_FSB1: - FSB1 - disk.write.bytes @@ -443,9 +458,6 @@ topology_template: disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests - network.incoming.packets.rate_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - network.incoming.packets.rate disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -455,9 +467,12 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.incoming.packets.rate_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.incoming.packets.rate + 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.outgoing.packets.rate_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - network.outgoing.packets.rate @@ -467,15 +482,9 @@ topology_template: attachment_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - attachment - network.incoming.bytes_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - network.incoming.bytes network.incoming.packets_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - network.incoming.packets - network.incoming.bytes_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.incoming.bytes attachment_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - attachment @@ -509,6 +518,12 @@ topology_template: 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 host_FSB1: - FSB1 - host @@ -524,82 +539,70 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - network.incoming.bytes.rate - network.incoming.bytes.rate_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.incoming.bytes.rate network.incoming.bytes_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - network.incoming.bytes - forwarder_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - forwarder 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 - forwarder_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - forwarder endpoint_FSB1: - FSB1 - endpoint - network.outgoing.bytes_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - network.outgoing.bytes network.outgoing.packets.rate_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - network.outgoing.packets.rate - network.outgoing.packets.rate_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - 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 - network.outgoing.packets.rate_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.outgoing.packets.rate disk.latency_FSB1: - FSB1 - disk.latency - network.outpoing.packets_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.outpoing.packets - network.outpoing.packets_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - network.outpoing.packets memory.usage_FSB1: - FSB1 - memory.usage - network.outgoing.bytes.rate_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - network.outgoing.bytes.rate + feature_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 + - feature disk.read.requests_FSB1: - FSB1 - disk.read.requests disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - feature_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - feature - feature_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 + 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 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 link_FSB1_FSB1_OAM: - FSB1_FSB1_OAM - link @@ -609,24 +612,21 @@ topology_template: dependency_FSB1: - FSB1 - dependency + link_FSB1_FSB2_Internal_1: + - FSB1_FSB2_Internal_1 + - link dependency_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - dependency link_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - link - link_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal2: - - FSB1_FSB2_Internal2 + dependency_FSB1_FSB2_Internal_2: + - FSB1_FSB2_Internal_2 - dependency - link_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 - - link - dependency_FSB1_FSB2_Internal1: - - FSB1_FSB2_Internal1 + dependency_FSB1_FSB2_Internal_1: + - FSB1_FSB2_Internal_1 - dependency -- cgit 1.2.3-korg