From 6ce1094d509195fe484761467a67a6b3757593b0 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Thu, 29 Nov 2018 20:46:49 +0530 Subject: 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 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 150 ++++++++++----------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2f86795f4a..5005610295 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/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 @@ -111,14 +111,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: @@ -154,7 +154,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: @@ -171,19 +171,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: @@ -207,13 +212,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: @@ -231,7 +236,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: @@ -243,6 +248,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. @@ -260,11 +271,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. @@ -283,6 +289,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: @@ -294,6 +305,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: @@ -305,31 +322,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 @@ -374,14 +385,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 @@ -403,11 +414,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. @@ -426,15 +432,9 @@ 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. occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED -- cgit 1.2.3-korg