diff options
author | 2017-11-05 17:14:25 +0200 | |
---|---|---|
committer | 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/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml | |
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/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml')
1 files changed, 85 insertions, 85 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. |