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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml')
1 files changed, 86 insertions, 86 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index d0921140a5..e2354d22f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -16,6 +16,19 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,62 +39,49 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - vm_image_name: - type: string - required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + port_pd_server_1b_port_2_network_role_tag: + type: string required: true - entry_schema: - type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_2_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_network_role: + type: string required: true - port_pd_server_1b_port_exCP_naming: + port_pd_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_1b_port_2_order: + type: integer + required: true + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: string node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -98,39 +98,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_2_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_2_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_2_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_2_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_2_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_2_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_2_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_2_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_2_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_2_network - index_value requirements: - binding: @@ -143,9 +143,9 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature + network.incoming.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes host_pd_server_1b: - pd_server_1b - host @@ -155,18 +155,9 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -176,30 +167,33 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu + binding_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - binding disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets.rate endpoint_pd_server_1b: - pd_server_1b - endpoint disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation + network.outpoing.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outpoing.packets memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets memory_pd_server_1b: - pd_server_1b - memory @@ -215,9 +209,9 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes.rate disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -227,9 +221,9 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -242,9 +236,18 @@ topology_template: disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - forwarder + feature_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -257,9 +260,6 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -269,36 +269,36 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate + network.incoming.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets disk.device.capacity_pd_server_1b: - pd_server_1b - disk.device.capacity disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + attachment_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - attachment disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -306,9 +306,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + dependency_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - dependency + link_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 - link - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file |