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/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml | |
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/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml')
1 files changed, 101 insertions, 101 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index ae99281d24..acb814e35d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_nested_parent_interface: type: list required: true @@ -30,10 +26,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_vdbe_availability_zone: type: list required: true @@ -52,12 +44,22 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -110,16 +112,36 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_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 @@ -140,22 +162,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -180,76 +192,57 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vdbe: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_nested: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_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 - network.outgoing.bytes_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -258,16 +251,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_vdbe_vdbe_untr_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -279,6 +262,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -315,20 +303,26 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_vdbe: 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_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_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_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node + network.incoming.packets.rate_vdbe_vdbe_untr_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 @@ -349,37 +343,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_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.device.allocation_vdbe: + disk.device.capacity_vdbe: 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.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_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.usage_vdbe: + disk.device.allocation_vdbe: 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_vdbe_vdbe_untr_port: + disk.usage_vdbe: 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_vdbe_vdbe_untr_port: + memory.usage_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -391,12 +385,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -404,13 +393,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_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 instance_vdbe: 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_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_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: @@ -440,11 +435,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -481,9 +471,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -506,17 +495,34 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_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.read.bytes.rate_vdbe: 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_vdbe_vdbe_untr_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 os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -558,12 +564,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_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 org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -675,4 +675,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED |