diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation')
3 files changed, 314 insertions, 341 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml index d8a7a103fd..c99b60175a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml @@ -106,7 +106,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: network: Internal2-net @@ -116,7 +116,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -126,12 +126,12 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: get_input: fsb1-Internal1-mac - network: {get_attribute: [FSB2_Internal_1, att]} + network: {get_attribute: [FSB_2_Internal_port_0, att]} requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -141,12 +141,12 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: get_input: fsb1-Internal1-mac - network: {get_attribute: [FSB2_Internal_1, att]} + network: {get_attribute: [FSB_2_Internal_port_0, att]} requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -162,7 +162,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -170,11 +170,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB1 @@ -239,7 +239,7 @@ topology_template: availability_zone: get_input: fsb_zone name: - get_attribute: [FSB1_Internal_1, name] + get_attribute: [FSB_1_Internal_port_1, name] artifacts: nimbus-ethernet-gw: type: tosca.artifacts.Deployment @@ -259,8 +259,8 @@ topology_template: cmaui_volume1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB_1_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_1_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB_2_Internal_port_1,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } cmaui_volume2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -270,8 +270,8 @@ topology_template: cmaui_volume3: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: - volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]} - size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } + volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB_2_Internal_port_0,tenant_id ] } ]} + size: { get_attribute: [FSB_2_Internal_port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } groups: ep-jsa_net_group: type: org.openecomp.groups.heat.HeatStack @@ -280,9 +280,9 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB2_Internal_2 - - FSB2_Internal_1 - - FSB1_Internal_1 - - FSB1_Internal_2 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 - FSB1_template - FSB2_template
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index f20b53326b..1a7ae59586 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true status: SUPPORTED compute_FSB1_metadata: @@ -34,58 +24,60 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB2_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role: + type: string required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: + type: string + port_FSB_Internal_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: + port_FSB_Internal_port_0_mac_address: type: string required: true status: SUPPORTED - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + vm_flavor_name: type: string required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list + port_FSB_Internal_port_1_mac_address: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_0_related_networks: + type: list required: true status: SUPPORTED - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_FSB_Internal_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_FSB1_Internal_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_FSB1_availability_zone: type: list required: true @@ -100,47 +92,55 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_mac_address: - type: string + port_FSB_Internal_port_0_order: + type: integer required: true status: SUPPORTED - port_FSB2_Internal_exCP_naming: + port_FSB_Internal_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_order: - type: integer + port_FSB_Internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_FSB2_Internal_network: + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_mac_requirements: + port_FSB_Internal_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_name: - type: list + port_FSB_Internal_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB_Internal_port_1_subnetpoolid: type: string required: true status: SUPPORTED attributes: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string status: SUPPORTED - FSB1_FSB1_Internal_network_id: + FSB1_FSB_1_Internal_port_1_device_owner: type: string status: SUPPORTED FSB1_user_data_format: @@ -154,37 +154,28 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_status: - type: string - status: SUPPORTED - FSB1_FSB1_Internal_device_owner: - type: string - status: SUPPORTED requirements: - - dependency_FSB1_FSB1_Internal: + - dependency_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB1_Internal: + - link_FSB1_FSB_1_Internal_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_FSB1_FSB2_Internal: + - dependency_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_FSB1_FSB2_Internal: + - link_FSB1_FSB_1_Internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -205,13 +196,29 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_FSB1_FSB2_Internal: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 - UNBOUNDED disk.capacity_FSB1: type: org.openecomp.capabilities.metric.Ceilometer @@ -225,6 +232,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_FSB1_FSB_1_Internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -267,112 +284,94 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_FSB1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB1_Internal: + memory.resident_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB1_Internal: + cpu_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB2_Internal: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + disk.write.requests.rate_FSB1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB2_Internal: + instance_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_FSB1: + disk.device.read.bytes.rate_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.Forwarder + cpu.delta_FSB1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_FSB1_FSB2_Internal: + disk.write.bytes_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_FSB1: + disk.device.read.requests.rate_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_FSB1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu.delta_FSB1: + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_FSB1_FSB1_Internal: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.device.read.requests.rate_FSB1: + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB1_Internal: + feature_FSB1_FSB_1_Internal_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -383,6 +382,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -400,30 +404,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_FSB1_FSB1_Internal: + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_FSB1_FSB1_Internal: - type: tosca.capabilities.Attachment + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_FSB1: + network.incoming.packets_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_FSB1_FSB1_Internal: + network.incoming.packets_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB2_Internal: + memory_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -458,6 +463,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_FSB1_FSB_1_Internal_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED host_FSB1: type: tosca.capabilities.Container valid_source_types: @@ -488,19 +509,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_FSB1_FSB2_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -512,29 +521,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED endpoint_FSB1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB1_Internal: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.latency_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -553,19 +544,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_FSB1: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_FSB1_FSB2_Internal: + disk.device.write.requests_FSB1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_FSB1_FSB2_Internal: + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -577,7 +568,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_FSB1_FSB2_Internal: + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml index 3e648300da..f18caf42b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml @@ -11,68 +11,62 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true - port_FSB1_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_related_networks: + port_FSB_Internal_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_subnetpoolid: - type: string + port_FSB_Internal_port_1_order: + type: integer required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json - port_FSB2_Internal_vlan_requirements: + port_FSB_Internal_port_1_network_role: + type: string + required: true + port_FSB_Internal_port_0_network_role: + type: string + required: true + port_FSB_Internal_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_order: - type: integer + type: string + port_FSB_Internal_port_1_network_role_tag: + type: string + required: true + port_FSB_Internal_port_0_mac_address: + type: string required: true - port_FSB2_Internal_ip_requirements: + port_FSB_Internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_FSB2_Internal_network_role: + port_FSB_Internal_port_1_mac_address: type: string required: true - port_FSB1_Internal_related_networks: + port_FSB_Internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_FSB1_Internal_network_role_tag: - type: string + port_FSB_Internal_port_0_ip_requirements: + type: list required: true - port_FSB1_Internal_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB2_Internal_subnetpoolid: - type: string - required: true - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true compute_FSB1_availability_zone: type: list required: true @@ -85,99 +79,105 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_mac_requirements: + port_FSB_Internal_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_mac_address: - type: string - required: true - port_FSB2_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_order: + port_FSB_Internal_port_0_order: type: integer required: true - port_FSB2_Internal_network: + port_FSB_Internal_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_FSB_Internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_0_network_role_tag: + type: string required: true compute_FSB1_name: type: list required: true entry_schema: type: string - port_FSB2_Internal_network_role_tag: + port_FSB_Internal_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB_Internal_port_0_subnetpoolid: + type: string + required: true + port_FSB_Internal_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB_Internal_port_1_subnetpoolid: type: string required: true node_templates: - FSB1_FSB1_Internal: + FSB1_FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB1_Internal_mac_requirements + get_input: port_FSB_Internal_port_1_mac_requirements order: - get_input: port_FSB1_Internal_order + get_input: port_FSB_Internal_port_1_order mac_address: - get_input: port_FSB1_Internal_mac_address + get_input: port_FSB_Internal_port_1_mac_address exCP_naming: - get_input: port_FSB1_Internal_exCP_naming + get_input: port_FSB_Internal_port_1_exCP_naming vlan_requirements: - get_input: port_FSB1_Internal_vlan_requirements + get_input: port_FSB_Internal_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB1_Internal_ip_requirements + get_input: port_FSB_Internal_port_1_ip_requirements related_networks: - get_input: port_FSB1_Internal_related_networks + get_input: port_FSB_Internal_port_1_related_networks network_role_tag: - get_input: port_FSB1_Internal_network_role_tag + get_input: port_FSB_Internal_port_1_network_role_tag network_role: - get_input: port_FSB1_Internal_network_role + get_input: port_FSB_Internal_port_1_network_role subnetpoolid: - get_input: port_FSB1_Internal_subnetpoolid + get_input: port_FSB_Internal_port_1_subnetpoolid network: get_attribute: - - FSB1_FSB2_Internal + - FSB1_FSB_2_Internal_port_0 - att requirements: - binding: capability: tosca.capabilities.network.Bindable node: FSB1 relationship: tosca.relationships.network.BindsTo - FSB1_FSB2_Internal: + FSB1_FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_FSB2_Internal_mac_requirements + get_input: port_FSB_Internal_port_0_mac_requirements order: - get_input: port_FSB2_Internal_order + get_input: port_FSB_Internal_port_0_order mac_address: - get_input: port_FSB2_Internal_mac_address + get_input: port_FSB_Internal_port_0_mac_address exCP_naming: - get_input: port_FSB2_Internal_exCP_naming + get_input: port_FSB_Internal_port_0_exCP_naming vlan_requirements: - get_input: port_FSB2_Internal_vlan_requirements + get_input: port_FSB_Internal_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_FSB2_Internal_ip_requirements + get_input: port_FSB_Internal_port_0_ip_requirements related_networks: - get_input: port_FSB2_Internal_related_networks + get_input: port_FSB_Internal_port_0_related_networks network_role_tag: - get_input: port_FSB2_Internal_network_role_tag + get_input: port_FSB_Internal_port_0_network_role_tag network_role: - get_input: port_FSB2_Internal_network_role + get_input: port_FSB_Internal_port_0_network_role subnetpoolid: - get_input: port_FSB2_Internal_subnetpoolid + get_input: port_FSB_Internal_port_0_subnetpoolid device_id: get_attribute: - FSB1 - att network: get_input: - - port_FSB2_Internal_network + - port_FSB_Internal_port_0_network - index_value requirements: - binding: @@ -199,7 +199,7 @@ topology_template: - index_value name: get_attribute: - - FSB1_FSB1_Internal + - FSB1_FSB_1_Internal_port_1 - name artifacts: nimbus-ethernet-gw: @@ -209,18 +209,18 @@ topology_template: type: tosca.artifacts.Deployment file: ../Artifacts/nimbus-ethernet outputs: - FSB1_FSB2_Internal_tenant_id: + FSB1_FSB_1_Internal_port_1_network_id: type: string value: get_attribute: - - FSB1_FSB2_Internal - - tenant_id - FSB1_FSB1_Internal_network_id: + - FSB1_FSB_1_Internal_port_1 + - network_id + FSB1_FSB_1_Internal_port_1_device_owner: type: string value: get_attribute: - - FSB1_FSB1_Internal - - network_id + - FSB1_FSB_1_Internal_port_1 + - device_owner FSB1_user_data_format: type: string value: @@ -241,36 +241,33 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - FSB1_FSB2_Internal_network_id: - type: string - value: - get_attribute: - - FSB1_FSB2_Internal - - network_id - FSB1_FSB1_Internal_status: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - status - FSB1_FSB1_Internal_device_owner: - type: string - value: - get_attribute: - - FSB1_FSB1_Internal - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.FSB1 capabilities: - binding_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - binding + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outpoing.packets + network.outpoing.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outpoing.packets disk.capacity_FSB1: - FSB1 - disk.capacity disk.read.bytes.rate_FSB1: - FSB1 - disk.read.bytes.rate + forwarder_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - forwarder + forwarder_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - forwarder disk.device.latency_FSB1: - FSB1 - disk.device.latency @@ -292,36 +289,12 @@ topology_template: disk.root.size_FSB1: - FSB1 - disk.root.size - forwarder_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - forwarder feature_FSB1: - FSB1 - feature - network.incoming.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.packets.rate - network.outgoing.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes - feature_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - feature - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment - network.incoming.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets memory.resident_FSB1: - FSB1 - memory.resident - forwarder_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - forwarder - network.incoming.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.packets.rate cpu_FSB1: - FSB1 - cpu @@ -340,18 +313,36 @@ topology_template: disk.write.bytes_FSB1: - FSB1 - disk.write.bytes - binding_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - binding + attachment_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_FSB1: - FSB1 - disk.device.read.requests.rate - feature_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + attachment_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - attachment + network.incoming.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.outgoing.bytes.rate + feature_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - feature disk.device.read.requests_FSB1: - FSB1 - disk.device.read.requests + feature_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - feature disk.ephemeral.size_FSB1: - FSB1 - disk.ephemeral.size @@ -361,21 +352,21 @@ topology_template: disk.device.write.bytes_FSB1: - FSB1 - disk.device.write.bytes - network.incoming.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + network.incoming.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.bytes + network.incoming.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.bytes + network.incoming.packets_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets + network.incoming.packets_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - network.incoming.packets - attachment_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - attachment memory_FSB1: - FSB1 - memory - network.outpoing.packets_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outpoing.packets - network.outgoing.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.bytes.rate disk.device.read.bytes_FSB1: - FSB1 - disk.device.read.bytes @@ -391,6 +382,12 @@ topology_template: disk.usage_FSB1: - FSB1 - disk.usage + binding_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - binding + binding_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - binding host_FSB1: - FSB1 - host @@ -406,30 +403,15 @@ topology_template: disk.write.requests_FSB1: - FSB1 - disk.write.requests - network.outgoing.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal + network.outgoing.bytes_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 - network.outgoing.bytes - network.incoming.bytes_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes - network.outpoing.packets_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outpoing.packets disk.device.write.bytes.rate_FSB1: - FSB1 - disk.device.write.bytes.rate - network.outgoing.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.bytes.rate endpoint_FSB1: - FSB1 - endpoint - network.outgoing.packets.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.outgoing.packets.rate - network.incoming.bytes.rate_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - network.incoming.bytes.rate disk.latency_FSB1: - FSB1 - disk.latency @@ -439,40 +421,40 @@ topology_template: disk.read.requests_FSB1: - FSB1 - disk.read.requests + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - network.incoming.packets.rate disk.device.write.requests_FSB1: - FSB1 - disk.device.write.requests - network.incoming.bytes.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes.rate - network.incoming.bytes_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.incoming.bytes + network.incoming.packets.rate_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.incoming.packets.rate disk.iops_FSB1: - FSB1 - disk.iops - network.outgoing.packets.rate_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - network.outgoing.packets.rate + network.outgoing.bytes_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - network.outgoing.bytes disk.device.iops_FSB1: - FSB1 - disk.device.iops requirements: + dependency_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - dependency dependency_FSB1: - FSB1 - dependency - link_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - link - dependency_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal + dependency_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 - dependency - link_FSB1_FSB1_Internal: - - FSB1_FSB1_Internal - - link local_storage_FSB1: - FSB1 - local_storage - dependency_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - dependency + link_FSB1_FSB_1_Internal_port_0: + - FSB1_FSB_1_Internal_port_0 + - link + link_FSB1_FSB_1_Internal_port_1: + - FSB1_FSB_1_Internal_port_1 + - link |