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/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml')
1 files changed, 82 insertions, 82 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index 3f68b28f1f..0917b89370 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -11,17 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_main_1b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_1_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_main_1b_port_ip_requirements: + port_ps_server_main_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_main_1b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_main_1b_port_1_network_role: type: string required: true compute_ps_server_main_1b_availability_zone: @@ -29,9 +27,6 @@ topology_template: required: true entry_schema: type: string - port_ps_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,83 +34,88 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - vm_flavor_name: - type: string + port_ps_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps_server_main_1b_port_network_role: + vm_flavor_name: type: string required: true - port_ps_server_main_1b_port_order: - type: integer - required: true - port_ps_server_main_1b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_main_1b_port_related_networks: + port_ps_server_main_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_ps_server_main_1b_port_vlan_requirements: + port_ps_server_main_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_main_1b_name: type: list required: true entry_schema: type: string - port_ps_server_main_1b_port_replacement_policy: + port_ps_server_main_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_main_1b_port_1_network_role_tag: + type: string required: true - port_ps_server_main_1b_port_network: + port_ps_server_main_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string + port_ps_server_main_1b_port_1_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_1_subnetpoolid: + type: string + required: true node_templates: - ps_server_main_1b_ps_server_main_1b_port: + ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_main_1b_port_replacement_policy + - port_ps_server_main_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_main_1b_port_mac_requirements + get_input: port_ps_server_main_1b_port_1_mac_requirements order: - get_input: port_ps_server_main_1b_port_order + get_input: port_ps_server_main_1b_port_1_order exCP_naming: - get_input: port_ps_server_main_1b_port_exCP_naming + get_input: port_ps_server_main_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_main_1b_port_vlan_requirements + get_input: port_ps_server_main_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_main_1b_port_ip_requirements + get_input: port_ps_server_main_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_main_1b_port_related_networks + get_input: port_ps_server_main_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_main_1b_port_network_role_tag + get_input: port_ps_server_main_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_main_1b_port_network_role + get_input: port_ps_server_main_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_main_1b_port_fixed_ips + - port_ps_server_main_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_main_1b_port_subnetpoolid + get_input: port_ps_server_main_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_main_1b_port_network + - port_ps_server_main_1b_port_1_network - index_value requirements: - binding: @@ -140,9 +140,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_main_1b capabilities: - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.bytes disk.device.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests @@ -152,30 +149,39 @@ topology_template: disk.capacity_ps_server_main_1b: - ps_server_main_1b - disk.capacity - attachment_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - attachment + feature_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - feature + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outpoing.packets disk.device.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.bytes.rate + network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.packets vcpus_ps_server_main_1b: - ps_server_main_1b - vcpus - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.packets.rate cpu_util_ps_server_main_1b: - ps_server_main_1b - cpu_util - binding_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - binding disk.device.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.bytes.rate disk.device.read.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests.rate + attachment_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests.rate @@ -185,45 +191,39 @@ topology_template: instance_ps_server_main_1b: - ps_server_main_1b - instance - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outpoing.packets disk.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes.rate disk.latency_ps_server_main_1b: - ps_server_main_1b - disk.latency - feature_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - feature disk.device.read.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests + forwarder_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - forwarder memory.usage_ps_server_main_1b: - ps_server_main_1b - memory.usage - forwarder_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - forwarder disk.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.requests.rate + binding_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - binding scalable_ps_server_main_1b: - ps_server_main_1b - scalable - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.bytes - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.packets.rate disk.usage_ps_server_main_1b: - ps_server_main_1b - disk.usage disk.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.bytes.rate disk.ephemeral.size_ps_server_main_1b: - ps_server_main_1b - disk.ephemeral.size @@ -245,24 +245,24 @@ topology_template: disk.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.bytes.rate + network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.bytes binding_ps_server_main_1b: - ps_server_main_1b - binding - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.packets disk.device.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes.rate - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.bytes.rate host_ps_server_main_1b: - ps_server_main_1b - host disk.device.iops_ps_server_main_1b: - ps_server_main_1b - disk.device.iops + network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.bytes disk.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.write.requests @@ -287,28 +287,28 @@ topology_template: disk.device.usage_ps_server_main_1b: - ps_server_main_1b - disk.device.usage + network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.packets.rate memory_ps_server_main_1b: - ps_server_main_1b - memory disk.root.size_ps_server_main_1b: - ps_server_main_1b - disk.root.size - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.bytes.rate disk.allocation_ps_server_main_1b: - ps_server_main_1b - disk.allocation requirements: + link_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - link + dependency_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - dependency dependency_ps_server_main_1b: - ps_server_main_1b - dependency - link_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - link - dependency_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - local_storage
\ No newline at end of file + - local_storage |