diff options
author | 2018-11-29 20:46:49 +0530 | |
---|---|---|
committer | 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/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out | |
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/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out')
4 files changed, 338 insertions, 338 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2fb8dca3c6..ee5b626d47 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -115,14 +115,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -158,7 +158,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -175,19 +175,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: type: org.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_pd_server: + cpu_util_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -211,13 +216,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: type: org.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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -235,7 +240,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -247,6 +252,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -264,11 +275,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -287,6 +293,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -298,6 +309,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -309,31 +326,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: type: org.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_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -378,14 +389,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -407,11 +418,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -430,12 +436,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: - type: org.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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -451,10 +451,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_availability_zone: type: list required: true @@ -475,7 +471,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -485,52 +491,46 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_ps01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_ps01_port_network: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED attributes: @@ -552,38 +552,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_ps01_port: + - dependency_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: + - link_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.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_ps_server: type: org.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_ps_server_ps01_port: - type: org.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_ps_server: type: tosca.capabilities.Container valid_source_types: @@ -591,12 +579,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu.delta_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -609,8 +591,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_ps_server_ps_server_mgmt_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 @@ -631,6 +614,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -643,6 +631,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -661,7 +655,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_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: @@ -673,12 +667,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_ps_server_mgmt_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.read.bytes.rate_ps_server: type: org.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_ps_server_ps_server_mgmt_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 memory_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -702,6 +710,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -738,13 +751,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_ps01_port: + memory.resident_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -762,7 +775,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.packets_ps_server_ps_server_mgmt_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_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_ps_server_ps_server_mgmt_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: @@ -797,11 +821,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -813,19 +832,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: - 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 - forwarder_ps_server_ps01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -850,32 +856,26 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.capacity_ps_server: + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_ps_server: + disk.capacity_ps_server: type: org.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_ps_server_ps01_port: + disk.device.allocation_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index 78b4cc40d4..53045684e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -139,25 +139,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO - - AUTO - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO + - AUTO vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-PD-1 + - Network-PD-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-PD-1 - - Network-PD-0 compute_pd_server_user_data_format: - null - get_attribute: @@ -191,20 +191,20 @@ topology_template: - abstract_pd_server - pd_server_accessIPv4 - null + port_ps_server_mgmt_port_0_network: + - Network-PS-0 + - Network-PS-1 + port_ps_server_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: ps_flavor_name - vm_image_name: - get_input: ps_image_name - port_ps01_port_replacement_policy: + port_ps_server_mgmt_port_0_replacement_policy: - AUTO - AUTO - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: - - Network-PS-0 - - Network-PS-1 - port_ps01_port_ip_requirements: + vm_image_name: + get_input: ps_image_name + port_ps_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml index 520dd11d47..453cef9980 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -162,24 +162,27 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -189,24 +192,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -216,9 +222,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -228,30 +231,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -273,12 +279,12 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -288,9 +294,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -300,9 +303,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -310,12 +310,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml index 1a9e52500e..31c2a274c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true compute_ps_server_availability_zone: type: list required: true @@ -36,7 +33,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,43 +49,38 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true - port_ps01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps01_port_network: - type: list + port_ps_server_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true node_templates: ps_server: @@ -102,35 +102,35 @@ topology_template: get_input: - compute_ps_server_user_data_format - index_value - ps_server_ps01_port: + ps_server_ps_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps01_port_replacement_policy + - port_ps_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps_server_mgmt_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps_server_mgmt_port_0_order exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps_server_mgmt_port_0_network_role_tag network_role: - get_input: port_ps01_port_network_role + get_input: port_ps_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps_server_mgmt_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps_server_mgmt_port_0_network - index_value requirements: - binding: @@ -147,30 +147,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature + network.incoming.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets.rate feature_ps_server: - ps_server - feature @@ -180,12 +171,18 @@ topology_template: disk.device.read.requests.rate_ps_server: - ps_server - disk.device.read.requests.rate + feature_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - feature cpu_ps_server: - ps_server - cpu disk.device.write.bytes_ps_server: - ps_server - disk.device.write.bytes + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes disk.device.read.bytes_ps_server: - ps_server - disk.device.read.bytes @@ -195,15 +192,21 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.latency_ps_server: - ps_server - disk.device.latency + network.outpoing.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outpoing.packets disk.read.bytes.rate_ps_server: - ps_server - disk.read.bytes.rate + binding_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - binding memory_ps_server: - ps_server - memory @@ -216,6 +219,9 @@ topology_template: disk.write.requests_ps_server: - ps_server - disk.write.requests + forwarder_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - forwarder disk.latency_ps_server: - ps_server - disk.latency @@ -234,21 +240,27 @@ topology_template: cpu_util_ps_server: - ps_server - cpu_util + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.packets.rate memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes.rate + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets + attachment_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - attachment + network.incoming.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate @@ -264,21 +276,12 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port - - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port - - forwarder disk.device.write.bytes.rate_ps_server: - ps_server - disk.device.write.bytes.rate @@ -291,31 +294,28 @@ topology_template: disk.device.write.requests_ps_server: - ps_server - disk.device.write.requests + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes endpoint_ps_server: - ps_server - endpoint disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 - dependency + link_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage |