diff options
| author |   vempo <vitaliy.emporopulo@amdocs.com> | 2017-11-05 17:14:25 +0200 |
|---|---|---|
| committer | Vitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com> | 2017-11-05 15:39:16 +0000 |
| commit | 7b492b5f191cd5c22e3c4254f5f3ef7476122e9d (patch) | |
| tree | 883406afe9451ee6389ab9033021e528f2c9813a /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition | |
| parent | d059aeab877b4217e05dff07fdbaf61bf6c1a73e (diff) | |
Port scaling not working properly
Made changes in evaluating port naming pattern.
Change-Id: If9a3fc9c3d50fa5c4da319d2ff7d5f8ce6ca8ffe
Issue-ID: SDC-573
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition')
13 files changed, 688 insertions, 688 deletions
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 b994e51e02..ab82c14e0b 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 @@ -12,10 +12,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_ip_requirements: type: list required: true @@ -26,6 +22,10 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_OAM_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_FSB1_metadata: type: list required: true @@ -36,6 +36,16 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + 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_Internal1_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -44,12 +54,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal2_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -68,12 +72,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: string required: true @@ -88,6 +86,12 @@ node_types: status: SUPPORTED entry_schema: 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: type: list required: true @@ -98,16 +102,6 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB_OAM_network_role: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true @@ -118,6 +112,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_FSB2_Internal2_mac_address: type: string required: true @@ -126,20 +124,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB_OAM_subnetpoolid: - type: string - required: true - status: SUPPORTED port_FSB2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_FSB1_availability_zone: type: list required: true @@ -160,11 +150,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB2_Internal2_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_OAM_order: type: integer required: true status: SUPPORTED - port_FSB2_Internal2_network: + port_FSB1_OAM_network: type: list required: true status: SUPPORTED @@ -196,12 +192,10 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal2_order: type: integer required: true @@ -210,12 +204,12 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_OAM_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_Internal_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED compute_FSB1_name: @@ -224,6 +218,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB1_OAM_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - dependency_FSB1_FSB1_Internal: capability: tosca.capabilities.Node @@ -238,14 +238,14 @@ node_types: occurrences: - 1 - 1 - - dependency_FSB1_FSB_OAM: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB_OAM: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -292,13 +292,13 @@ node_types: - 1 - 1 capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB2_Internal2: + 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: @@ -310,18 +310,12 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_FSB1_FSB_OAM: - type: tosca.capabilities.Attachment + 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 - binding_FSB1_FSB_OAM: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.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. @@ -370,13 +364,13 @@ node_types: 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 - network.outgoing.bytes.rate_FSB1_FSB_OAM: + 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: @@ -405,12 +399,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB_OAM: - type: tosca.capabilities.Node + 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 - memory.resident_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: @@ -435,6 +430,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_FSB1_FSB2_Internal2: type: tosca.capabilities.network.Bindable valid_source_types: @@ -448,12 +448,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB_OAM: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.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. @@ -535,12 +529,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB_OAM: + 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. occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB1_OAM: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_FSB1_FSB1_OAM: + type: tosca.capabilities.Attachment + 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. @@ -564,25 +570,25 @@ node_types: 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.bytes.rate_FSB1_FSB_OAM: + 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.outpoing.packets_FSB1_FSB1_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: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB_OAM: + 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. occurrences: @@ -617,6 +623,12 @@ 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. + occurrences: + - 1 + - UNBOUNDED host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -647,12 +659,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB_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.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. @@ -760,12 +766,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB_OAM: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.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. 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 583f92a2e6..3506a90468 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 @@ -14,9 +14,6 @@ topology_template: port_FSB1_Internal_mac_address: type: string required: true - port_FSB_OAM_network_role_tag: - type: string - required: true port_FSB1_Internal_ip_requirements: type: list required: true @@ -25,6 +22,9 @@ topology_template: port_FSB1_Internal_subnetpoolid: type: string required: true + port_FSB1_OAM_subnetpoolid: + type: string + required: true compute_FSB1_metadata: type: list required: true @@ -33,17 +33,20 @@ topology_template: port_FSB2_Internal2_network_role_tag: type: string required: true + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB1_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_exCP_naming: type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal2_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -58,11 +61,6 @@ topology_template: port_FSB2_Internal1_network_role: type: string required: true - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: string required: true @@ -74,6 +72,11 @@ topology_template: required: true entry_schema: 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: type: list required: true @@ -82,14 +85,6 @@ topology_template: port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB_OAM_network_role: - type: string - required: true - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true @@ -98,23 +93,20 @@ topology_template: required: true entry_schema: type: string + port_FSB1_OAM_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_FSB2_Internal2_mac_address: type: string required: true port_FSB2_Internal2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB_OAM_subnetpoolid: - type: string - required: true port_FSB2_Internal2_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_FSB1_availability_zone: type: list required: true @@ -132,10 +124,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB2_Internal2_network: + type: list + required: true + entry_schema: + type: string + port_FSB1_OAM_order: type: integer required: true - port_FSB2_Internal2_network: + port_FSB1_OAM_network: type: list required: true entry_schema: @@ -160,28 +157,31 @@ topology_template: port_FSB2_Internal1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal2_order: type: integer required: true port_FSB2_Internal1_subnetpoolid: type: string required: true + port_FSB1_OAM_network_role_tag: + type: string + required: true port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_FSB1_name: type: list required: true entry_schema: type: string + port_FSB1_OAM_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -213,30 +213,30 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB_OAM: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_FSB_OAM_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB_OAM_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements ip_requirements: - get_input: port_FSB_OAM_ip_requirements + get_input: port_FSB1_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag + get_input: port_FSB1_OAM_network_role_tag mac_requirements: - get_input: port_FSB_OAM_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB_OAM_order + get_input: port_FSB1_OAM_order network_role: - get_input: port_FSB_OAM_network_role + get_input: port_FSB1_OAM_network_role subnetpoolid: - get_input: port_FSB_OAM_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB_OAM_fixed_ips + get_input: port_FSB1_OAM_fixed_ips network: get_input: - - port_FSB_OAM_network + - port_FSB1_OAM_network - index_value requirements: - binding: @@ -330,21 +330,18 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.packets.rate 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 - attachment_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - attachment - binding_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - binding + network.outgoing.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes disk.capacity_FSB1: - FSB1 - disk.capacity @@ -369,12 +366,12 @@ topology_template: disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outgoing.bytes.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes.rate disk.root.size_FSB1: - FSB1 - disk.root.size - network.outgoing.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes.rate feature_FSB1: - FSB1 - feature @@ -387,12 +384,12 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - network.outgoing.bytes - feature_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - feature memory.resident_FSB1: - FSB1 - memory.resident + network.incoming.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -402,15 +399,15 @@ topology_template: 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 - network.incoming.bytes_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate @@ -453,9 +450,15 @@ topology_template: network.incoming.packets.rate_FSB1_FSB2_Internal1: - FSB1_FSB2_Internal1 - network.incoming.packets.rate - network.outpoing.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outpoing.packets + network.outgoing.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.packets.rate + binding_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - binding + attachment_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - attachment network.incoming.bytes_FSB1_FSB2_Internal2: - FSB1_FSB2_Internal2 - network.incoming.bytes @@ -468,18 +471,18 @@ topology_template: attachment_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - attachment + network.incoming.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.bytes memory_FSB1: - FSB1 - memory - network.incoming.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes.rate + 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_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -495,6 +498,9 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + network.outpoing.packets_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outpoing.packets host_FSB1: - FSB1 - host @@ -510,9 +516,6 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.incoming.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets.rate network.incoming.bytes.rate_FSB1_FSB2_Internal2: - FSB1_FSB2_Internal2 - network.incoming.bytes.rate @@ -567,9 +570,6 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests - network.incoming.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests @@ -586,6 +586,12 @@ topology_template: - FSB1 - disk.device.iops requirements: + link_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - link + dependency_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - dependency dependency_FSB1: - FSB1 - dependency @@ -601,12 +607,6 @@ topology_template: local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - dependency - link_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - link dependency_FSB1_FSB2_Internal2: - FSB1_FSB2_Internal2 - dependency 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 30616940a7..ee57af5513 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 @@ -12,10 +12,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_ip_requirements: type: list required: true @@ -26,6 +22,10 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_OAM_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_FSB1_metadata: type: list required: true @@ -42,6 +42,16 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + 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: type: list required: true @@ -52,26 +62,20 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_vlan_requirements: - type: list + port_FSB2_Internal_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_network_role: + port_FSB1_Internal_network_role_tag: type: string required: true status: SUPPORTED - port_FSB_OAM_ip_requirements: + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_vlan_requirements: type: list required: true @@ -86,25 +90,11 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB_OAM_network_role: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true status: SUPPORTED - port_FSB_OAM_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED @@ -128,7 +118,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_OAM_order: type: integer required: true status: SUPPORTED @@ -140,6 +130,12 @@ node_types: 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 required: true @@ -148,24 +144,22 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_OAM_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_Internal_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED compute_FSB1_name: @@ -174,6 +168,12 @@ node_types: status: SUPPORTED entry_schema: type: string + 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: type: string required: true @@ -205,14 +205,14 @@ node_types: occurrences: - 1 - 1 - - dependency_FSB1_FSB_OAM: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB_OAM: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -233,24 +233,18 @@ node_types: - 0 - UNBOUNDED capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: + 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 - attachment_FSB1_FSB_OAM: - type: tosca.capabilities.Attachment + 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 - binding_FSB1_FSB_OAM: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED binding_FSB1_FSB2_Internal: type: tosca.capabilities.network.Bindable valid_source_types: @@ -306,13 +300,13 @@ node_types: 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 - network.outgoing.bytes.rate_FSB1_FSB_OAM: + 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: @@ -351,12 +345,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB_OAM: - type: tosca.capabilities.Node + 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 - memory.resident_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: @@ -380,13 +375,12 @@ node_types: occurrences: - 1 - 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. + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB_OAM: + 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: @@ -451,12 +445,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB_OAM: + 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. occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB1_OAM: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_FSB1_FSB1_OAM: + type: tosca.capabilities.Attachment + 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. @@ -468,31 +474,31 @@ node_types: 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.bytes.rate_FSB1_FSB_OAM: + 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.outpoing.packets_FSB1_FSB1_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: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB_OAM: + network.outgoing.bytes.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: @@ -527,6 +533,12 @@ 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. + occurrences: + - 1 + - UNBOUNDED host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -557,12 +569,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB_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.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. @@ -628,12 +634,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB_OAM: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.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. 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 10f6fd221e..372637f9e9 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 @@ -14,9 +14,6 @@ topology_template: port_FSB1_Internal_mac_address: type: string required: true - port_FSB_OAM_network_role_tag: - type: string - required: true port_FSB1_Internal_ip_requirements: type: list required: true @@ -25,6 +22,9 @@ topology_template: port_FSB1_Internal_subnetpoolid: type: string required: true + port_FSB1_OAM_subnetpoolid: + type: string + required: true compute_FSB1_metadata: type: list required: true @@ -38,6 +38,14 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB1_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal_ip_requirements: type: list required: true @@ -46,22 +54,17 @@ topology_template: vm_flavor_name: type: string required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: string required: true - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements 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: type: list required: true @@ -73,21 +76,10 @@ topology_template: port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB_OAM_network_role: - type: string - required: true - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true - port_FSB_OAM_subnetpoolid: - type: string - required: true - port_FSB_OAM_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true compute_FSB1_availability_zone: @@ -107,7 +99,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_OAM_order: type: integer required: true port_FSB2_Internal_mac_requirements: @@ -116,33 +108,41 @@ topology_template: 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: type: integer required: true - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true entry_schema: type: string + port_FSB1_OAM_network_role_tag: + type: string + required: true port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_FSB1_name: type: list required: true entry_schema: type: string + 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: type: string required: true @@ -207,30 +207,30 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB_OAM: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_FSB_OAM_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB_OAM_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements ip_requirements: - get_input: port_FSB_OAM_ip_requirements + get_input: port_FSB1_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag + get_input: port_FSB1_OAM_network_role_tag mac_requirements: - get_input: port_FSB_OAM_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB_OAM_order + get_input: port_FSB1_OAM_order network_role: - get_input: port_FSB_OAM_network_role + get_input: port_FSB1_OAM_network_role subnetpoolid: - get_input: port_FSB_OAM_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB_OAM_fixed_ips + get_input: port_FSB1_OAM_fixed_ips network: get_input: - - port_FSB_OAM_network + - port_FSB1_OAM_network - index_value requirements: - binding: @@ -264,15 +264,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.packets.rate - attachment_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - attachment - binding_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - binding + network.incoming.bytes.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.bytes.rate + network.outgoing.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes binding_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - binding @@ -300,12 +297,12 @@ topology_template: disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outgoing.bytes.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes.rate disk.root.size_FSB1: - FSB1 - disk.root.size - network.outgoing.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes.rate feature_FSB1: - FSB1 - feature @@ -324,12 +321,12 @@ topology_template: network.incoming.packets_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.incoming.packets - feature_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - feature memory.resident_FSB1: - FSB1 - memory.resident + network.incoming.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.packets.rate network.incoming.packets.rate_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.incoming.packets.rate @@ -339,12 +336,12 @@ topology_template: disk.write.requests.rate_FSB1: - FSB1 - disk.write.requests.rate + feature_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - feature instance_FSB1: - FSB1 - instance - network.incoming.bytes_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate @@ -375,30 +372,36 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.outpoing.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outpoing.packets + network.outgoing.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.packets.rate + binding_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - binding + 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.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.bytes memory_FSB1: - FSB1 - memory - network.incoming.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes.rate + 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 - network.outgoing.bytes_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -414,6 +417,9 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + network.outpoing.packets_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outpoing.packets host_FSB1: - FSB1 - host @@ -429,9 +435,6 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.incoming.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets.rate network.outgoing.bytes_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.outgoing.bytes @@ -465,9 +468,6 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests - network.incoming.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests @@ -487,6 +487,12 @@ topology_template: - FSB1 - disk.device.iops requirements: + link_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - link + dependency_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - dependency dependency_FSB1: - FSB1 - dependency @@ -502,12 +508,6 @@ topology_template: local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - dependency - link_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - dependency 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 a42219e96f..b11b6f002b 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 @@ -12,10 +12,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_ip_requirements: type: list required: true @@ -26,6 +22,10 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_OAM_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_FSB1_metadata: type: list required: true @@ -42,6 +42,16 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + 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: type: list required: true @@ -52,26 +62,20 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_vlan_requirements: - type: list + port_FSB2_Internal_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_network_role: + port_FSB1_Internal_network_role_tag: type: string required: true status: SUPPORTED - port_FSB_OAM_ip_requirements: + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_vlan_requirements: type: list required: true @@ -86,25 +90,11 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB_OAM_network_role: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true status: SUPPORTED - port_FSB_OAM_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED @@ -128,7 +118,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_OAM_order: type: integer required: true status: SUPPORTED @@ -140,6 +130,12 @@ node_types: 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 required: true @@ -148,24 +144,22 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_OAM_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + port_FSB1_Internal_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED compute_FSB1_name: @@ -174,14 +168,17 @@ node_types: status: SUPPORTED entry_schema: type: string + 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: type: string required: true status: SUPPORTED attributes: - FSB1_FSB_OAM_status: - type: string - status: SUPPORTED FSB1_FSB2_Internal_tenant_id: type: string status: SUPPORTED @@ -191,6 +188,9 @@ node_types: FSB1_accessIPv6: type: string status: SUPPORTED + FSB1_FSB1_OAM_status: + type: string + status: SUPPORTED FSB1_addresses: type: map status: SUPPORTED @@ -229,14 +229,14 @@ node_types: occurrences: - 1 - 1 - - dependency_FSB1_FSB_OAM: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB_OAM: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -257,24 +257,18 @@ node_types: - 0 - UNBOUNDED capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: + 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 - attachment_FSB1_FSB_OAM: - type: tosca.capabilities.Attachment + 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 - binding_FSB1_FSB_OAM: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED binding_FSB1_FSB2_Internal: type: tosca.capabilities.network.Bindable valid_source_types: @@ -330,13 +324,13 @@ node_types: 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 - network.outgoing.bytes.rate_FSB1_FSB_OAM: + 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: @@ -375,12 +369,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB_OAM: - type: tosca.capabilities.Node + 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 - memory.resident_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: @@ -404,13 +399,12 @@ node_types: occurrences: - 1 - 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. + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB_OAM: + 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: @@ -475,12 +469,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB_OAM: + 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. occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB1_OAM: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_FSB1_FSB1_OAM: + type: tosca.capabilities.Attachment + 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. @@ -492,31 +498,31 @@ node_types: 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.bytes.rate_FSB1_FSB_OAM: + 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.outpoing.packets_FSB1_FSB1_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: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB_OAM: + network.outgoing.bytes.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: @@ -551,6 +557,12 @@ 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. + occurrences: + - 1 + - UNBOUNDED host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -581,12 +593,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB_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.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. @@ -652,12 +658,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB_OAM: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.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. 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 b9e572afae..3d5452f348 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 @@ -14,9 +14,6 @@ topology_template: port_FSB1_Internal_mac_address: type: string required: true - port_FSB_OAM_network_role_tag: - type: string - required: true port_FSB1_Internal_ip_requirements: type: list required: true @@ -25,6 +22,9 @@ topology_template: port_FSB1_Internal_subnetpoolid: type: string required: true + port_FSB1_OAM_subnetpoolid: + type: string + required: true compute_FSB1_metadata: type: list required: true @@ -38,6 +38,14 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB1_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal_ip_requirements: type: list required: true @@ -46,22 +54,17 @@ topology_template: vm_flavor_name: type: string required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: string required: true - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements 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: type: list required: true @@ -73,21 +76,10 @@ topology_template: port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB_OAM_network_role: - type: string - required: true - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true - port_FSB_OAM_subnetpoolid: - type: string - required: true - port_FSB_OAM_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true compute_FSB1_availability_zone: @@ -107,7 +99,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_OAM_order: type: integer required: true port_FSB2_Internal_mac_requirements: @@ -116,33 +108,41 @@ topology_template: 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: type: integer required: true - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true entry_schema: type: string + port_FSB1_OAM_network_role_tag: + type: string + required: true port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_FSB1_name: type: list required: true entry_schema: type: string + 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: type: string required: true @@ -207,30 +207,30 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB_OAM: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_FSB_OAM_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB_OAM_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements ip_requirements: - get_input: port_FSB_OAM_ip_requirements + get_input: port_FSB1_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag + get_input: port_FSB1_OAM_network_role_tag mac_requirements: - get_input: port_FSB_OAM_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB_OAM_order + get_input: port_FSB1_OAM_order network_role: - get_input: port_FSB_OAM_network_role + get_input: port_FSB1_OAM_network_role subnetpoolid: - get_input: port_FSB_OAM_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB_OAM_fixed_ips + get_input: port_FSB1_OAM_fixed_ips network: get_input: - - port_FSB_OAM_network + - port_FSB1_OAM_network - index_value requirements: - binding: @@ -262,12 +262,6 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB_OAM_status: - type: string - value: - get_attribute: - - FSB1_FSB_OAM - - status FSB1_FSB2_Internal_tenant_id: type: string value: @@ -286,6 +280,12 @@ topology_template: get_attribute: - FSB1 - accessIPv6 + FSB1_FSB1_OAM_status: + type: string + value: + get_attribute: + - FSB1_FSB1_OAM + - status FSB1_addresses: type: map value: @@ -309,15 +309,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.packets.rate - attachment_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - attachment - binding_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - binding + network.incoming.bytes.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.bytes.rate + network.outgoing.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes binding_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - binding @@ -345,12 +342,12 @@ topology_template: disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outgoing.bytes.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes.rate disk.root.size_FSB1: - FSB1 - disk.root.size - network.outgoing.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes.rate feature_FSB1: - FSB1 - feature @@ -369,12 +366,12 @@ topology_template: network.incoming.packets_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.incoming.packets - feature_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - feature memory.resident_FSB1: - FSB1 - memory.resident + network.incoming.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.packets.rate network.incoming.packets.rate_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.incoming.packets.rate @@ -384,12 +381,12 @@ topology_template: disk.write.requests.rate_FSB1: - FSB1 - disk.write.requests.rate + feature_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - feature instance_FSB1: - FSB1 - instance - network.incoming.bytes_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate @@ -420,30 +417,36 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.outpoing.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outpoing.packets + network.outgoing.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.packets.rate + binding_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - binding + 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.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.bytes memory_FSB1: - FSB1 - memory - network.incoming.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes.rate + 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 - network.outgoing.bytes_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -459,6 +462,9 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + network.outpoing.packets_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outpoing.packets host_FSB1: - FSB1 - host @@ -474,9 +480,6 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.incoming.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets.rate network.outgoing.bytes_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.outgoing.bytes @@ -510,9 +513,6 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests - network.incoming.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests @@ -532,6 +532,12 @@ topology_template: - FSB1 - disk.device.iops requirements: + link_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - link + dependency_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - dependency dependency_FSB1: - FSB1 - dependency @@ -547,12 +553,6 @@ topology_template: local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - dependency - link_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - dependency 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 d2ea7e94b4..1066c6e948 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 @@ -12,10 +12,6 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_ip_requirements: type: list required: true @@ -26,6 +22,10 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_OAM_subnetpoolid: + type: string + required: true + status: SUPPORTED port_FSB2_Internal_vlan_requirements: type: list required: true @@ -36,6 +36,16 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + 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: type: list required: true @@ -46,26 +56,20 @@ node_types: type: string required: true status: SUPPORTED - port_FSB_OAM_vlan_requirements: - type: list + port_FSB2_Internal_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_network_role: + port_FSB1_Internal_network_role_tag: type: string required: true status: SUPPORTED - port_FSB_OAM_ip_requirements: + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_vlan_requirements: type: list required: true @@ -80,25 +84,11 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB_OAM_network_role: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true status: SUPPORTED - port_FSB_OAM_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED @@ -116,7 +106,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_OAM_order: type: integer required: true status: SUPPORTED @@ -128,6 +118,12 @@ node_types: 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 required: true @@ -136,34 +132,35 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_FSB1_OAM_network_role_tag: + type: string + required: true + status: SUPPORTED port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + 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: type: string required: true status: SUPPORTED attributes: - FSB1_FSB_OAM_status: - type: string - status: SUPPORTED FSB1_FSB2_Internal_tenant_id: type: string status: SUPPORTED @@ -173,6 +170,9 @@ node_types: FSB1_accessIPv6: type: string status: SUPPORTED + FSB1_FSB1_OAM_status: + type: string + status: SUPPORTED FSB1_addresses: type: map status: SUPPORTED @@ -211,14 +211,14 @@ node_types: occurrences: - 1 - 1 - - dependency_FSB1_FSB_OAM: + - dependency_FSB1_FSB1_OAM: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB_OAM: + - link_FSB1_FSB1_OAM: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -239,24 +239,18 @@ node_types: - 0 - UNBOUNDED capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: + 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 - attachment_FSB1_FSB_OAM: - type: tosca.capabilities.Attachment + 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 - binding_FSB1_FSB_OAM: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED binding_FSB1_FSB2_Internal: type: tosca.capabilities.network.Bindable valid_source_types: @@ -312,13 +306,13 @@ node_types: 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 - network.outgoing.bytes.rate_FSB1_FSB_OAM: + 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: @@ -357,12 +351,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB_OAM: - type: tosca.capabilities.Node + 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 - memory.resident_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: @@ -386,13 +381,12 @@ node_types: occurrences: - 1 - 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. + feature_FSB1_FSB1_OAM: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB_OAM: + 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: @@ -457,12 +451,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB_OAM: + 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. occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB1_OAM: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_FSB1_FSB1_OAM: + type: tosca.capabilities.Attachment + 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. @@ -474,31 +480,31 @@ node_types: 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.bytes.rate_FSB1_FSB_OAM: + 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.outpoing.packets_FSB1_FSB1_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: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB_OAM: + network.outgoing.bytes.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: @@ -533,6 +539,12 @@ 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. + occurrences: + - 1 + - UNBOUNDED host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -563,12 +575,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB_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.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. @@ -634,12 +640,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB_OAM: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.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. 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 7112a172e7..d72f1f9355 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 @@ -14,9 +14,6 @@ topology_template: port_FSB1_Internal_mac_address: type: string required: true - port_FSB_OAM_network_role_tag: - type: string - required: true port_FSB1_Internal_ip_requirements: type: list required: true @@ -25,6 +22,9 @@ topology_template: port_FSB1_Internal_subnetpoolid: type: string required: true + port_FSB1_OAM_subnetpoolid: + type: string + required: true port_FSB2_Internal_vlan_requirements: type: list required: true @@ -33,6 +33,14 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB1_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal_ip_requirements: type: list required: true @@ -41,22 +49,17 @@ topology_template: vm_flavor_name: type: string required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: string required: true - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements 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: type: list required: true @@ -68,21 +71,10 @@ topology_template: port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB_OAM_network_role: - type: string - required: true - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string port_FSB1_Internal_network_role: type: string required: true - port_FSB_OAM_subnetpoolid: - type: string - required: true - port_FSB_OAM_mac_requirements: + port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true port_FSB1_Internal_network: @@ -97,7 +89,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_OAM_order: type: integer required: true port_FSB2_Internal_mac_requirements: @@ -106,28 +98,36 @@ topology_template: 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: type: integer required: true - port_FSB_OAM_fixed_ips: - type: list + port_FSB1_OAM_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal_network: type: list required: true entry_schema: type: string + port_FSB1_OAM_network_role_tag: + type: string + required: true port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + 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: type: string required: true @@ -192,30 +192,30 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB_OAM: + FSB1_FSB1_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_FSB_OAM_exCP_naming + get_input: port_FSB1_OAM_exCP_naming vlan_requirements: - get_input: port_FSB_OAM_vlan_requirements + get_input: port_FSB1_OAM_vlan_requirements ip_requirements: - get_input: port_FSB_OAM_ip_requirements + get_input: port_FSB1_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag + get_input: port_FSB1_OAM_network_role_tag mac_requirements: - get_input: port_FSB_OAM_mac_requirements + get_input: port_FSB1_OAM_mac_requirements order: - get_input: port_FSB_OAM_order + get_input: port_FSB1_OAM_order network_role: - get_input: port_FSB_OAM_network_role + get_input: port_FSB1_OAM_network_role subnetpoolid: - get_input: port_FSB_OAM_subnetpoolid + get_input: port_FSB1_OAM_subnetpoolid fixed_ips: - get_input: port_FSB_OAM_fixed_ips + get_input: port_FSB1_OAM_fixed_ips network: get_input: - - port_FSB_OAM_network + - port_FSB1_OAM_network - index_value requirements: - binding: @@ -242,12 +242,6 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB_OAM_status: - type: string - value: - get_attribute: - - FSB1_FSB_OAM - - status FSB1_FSB2_Internal_tenant_id: type: string value: @@ -266,6 +260,12 @@ topology_template: get_attribute: - FSB1 - accessIPv6 + FSB1_FSB1_OAM_status: + type: string + value: + get_attribute: + - FSB1_FSB1_OAM + - status FSB1_addresses: type: map value: @@ -289,15 +289,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: - network.outgoing.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.packets.rate - attachment_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - attachment - binding_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - binding + network.incoming.bytes.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.bytes.rate + network.outgoing.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes binding_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - binding @@ -325,12 +322,12 @@ topology_template: disk.device.write.requests.rate_FSB1: - FSB1 - disk.device.write.requests.rate + network.outgoing.bytes.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.bytes.rate disk.root.size_FSB1: - FSB1 - disk.root.size - network.outgoing.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes.rate feature_FSB1: - FSB1 - feature @@ -349,12 +346,12 @@ topology_template: network.incoming.packets_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.incoming.packets - feature_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - feature memory.resident_FSB1: - FSB1 - memory.resident + network.incoming.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.packets.rate network.incoming.packets.rate_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.incoming.packets.rate @@ -364,12 +361,12 @@ topology_template: disk.write.requests.rate_FSB1: - FSB1 - disk.write.requests.rate + feature_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - feature instance_FSB1: - FSB1 - instance - network.incoming.bytes_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes disk.device.read.bytes.rate_FSB1: - FSB1 - disk.device.read.bytes.rate @@ -400,30 +397,36 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.outpoing.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outpoing.packets + network.outgoing.packets.rate_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outgoing.packets.rate + binding_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - binding + 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.bytes_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.incoming.bytes memory_FSB1: - FSB1 - memory - network.incoming.bytes.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.bytes.rate + 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 - network.outgoing.bytes_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.outgoing.bytes disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -439,6 +442,9 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + network.outpoing.packets_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - network.outpoing.packets host_FSB1: - FSB1 - host @@ -454,9 +460,6 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.incoming.packets.rate_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets.rate network.outgoing.bytes_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.outgoing.bytes @@ -490,9 +493,6 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests - network.incoming.packets_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - network.incoming.packets disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests @@ -512,6 +512,12 @@ topology_template: - FSB1 - disk.device.iops requirements: + link_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - link + dependency_FSB1_FSB1_OAM: + - FSB1_FSB1_OAM + - dependency dependency_FSB1: - FSB1 - dependency @@ -527,12 +533,6 @@ topology_template: local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - dependency - link_FSB1_FSB_OAM: - - FSB1_FSB_OAM - - link dependency_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml index 01656bfca9..7912c41037 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml @@ -187,15 +187,12 @@ topology_template: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB_OAM_network: - - jsa_net1 port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: get_input: fsb1-Internal2-mac - port_FSB_OAM_fixed_ips: - - ip_address: - get_input: fsb1-oam-ip + port_FSB1_OAM_network: + - jsa_net1 port_FSB2_Internal_network: - Internal2-net compute_FSB_metadata: @@ -204,6 +201,9 @@ topology_template: - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone + port_FSB1_OAM_fixed_ips: + - ip_address: + get_input: fsb1-oam-ip compute_FSB_name: - get_input: fsb1-name service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml index 61fb3fe6f0..c6362e351f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml @@ -181,15 +181,12 @@ topology_template: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB_OAM_network: - - jsa_net1 port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: get_input: fsb1-Internal2-mac - port_FSB_OAM_fixed_ips: - - ip_address: - get_input: fsb1-oam-ip + port_FSB1_OAM_network: + - jsa_net1 port_FSB2_Internal_network: - Internal2-net compute_FSB_metadata: @@ -198,6 +195,9 @@ topology_template: - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone + port_FSB1_OAM_fixed_ips: + - ip_address: + get_input: fsb1-oam-ip compute_FSB_name: - get_input: fsb1-name service_template_filter: @@ -217,7 +217,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - - link_FSB_FSB_OAM: + - link_FSB_FSB1_OAM: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml index 4c75e2c736..1aab8cb5c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml @@ -228,7 +228,7 @@ topology_template: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB_OAM_status + - FSB1_FSB1_OAM_status - 0 - OS-EXT-IPS-MAC:mac_addr cmaui_volume2: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml index c76d482953..1036541b5f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml @@ -279,7 +279,7 @@ topology_template: - CMAUI_volume_type - get_attribute: - FSB1 - - FSB1_FSB_OAM_user_data_format + - FSB1_FSB1_OAM_user_data_format - 0 - OS-EXT-IPS-MAC:mac_addr complexOutput3: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml index f5dd56531d..44523935d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml @@ -201,15 +201,12 @@ topology_template: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - port_FSB_OAM_network: - - jsa_net1 port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: get_input: fsb1-Internal2-mac - port_FSB_OAM_fixed_ips: - - ip_address: - get_input: fsb1-oam-ip + port_FSB1_OAM_network: + - jsa_net1 port_FSB2_Internal_network: - Internal2-net compute_FSB_metadata: @@ -218,6 +215,9 @@ topology_template: - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone + port_FSB1_OAM_fixed_ips: + - ip_address: + get_input: fsb1-oam-ip compute_FSB_name: - get_input: fsb1-name service_template_filter: @@ -237,7 +237,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - - link_FSB_FSB_OAM: + - link_FSB_FSB1_OAM: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo |