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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.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/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml')
1 files changed, 88 insertions, 88 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index b7f6826e85..fe904e5a1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -11,11 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui02_port_related_networks: + port_cmaui02_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui02_port_2_network: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_subnetpoolid: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,17 +36,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui02_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true vm_flavor_name: type: string required: true @@ -42,89 +44,87 @@ topology_template: required: true entry_schema: type: string - port_cmaui02_port_vlan_requirements: + port_cmaui02_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui02_port_2_network_role: + type: string + required: true + port_cmaui02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - vm_image_name: + port_cmaui02_port_2_network_role_tag: type: string required: true - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui02_port_order: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui02_port_2_order: type: integer required: true - port_cmaui02_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_cmaui02_port_network_role: + vm_image_name: type: string required: true - port_cmaui02_port_security_groups: + port_cmaui02_port_2_security_groups: type: list required: true entry_schema: type: json - port_cmaui02_port_subnetpoolid: - type: string - required: true - port_cmaui02_port_network: + port_cmaui02_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_cmaui02_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - cmaui_cmaui02_port: + cmaui_cmaui02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui02_port_replacement_policy + - port_cmaui02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_cmaui02_port_mac_requirements + get_input: port_cmaui02_port_2_mac_requirements order: - get_input: port_cmaui02_port_order + get_input: port_cmaui02_port_2_order security_groups: get_input: - - port_cmaui02_port_security_groups + - port_cmaui02_port_2_security_groups - index_value exCP_naming: - get_input: port_cmaui02_port_exCP_naming + get_input: port_cmaui02_port_2_exCP_naming vlan_requirements: - get_input: port_cmaui02_port_vlan_requirements + get_input: port_cmaui02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cmaui02_port_related_networks + get_input: port_cmaui02_port_2_related_networks ip_requirements: - get_input: port_cmaui02_port_ip_requirements + get_input: port_cmaui02_port_2_ip_requirements network_role_tag: - get_input: port_cmaui02_port_network_role_tag + get_input: port_cmaui02_port_2_network_role_tag network_role: - get_input: port_cmaui02_port_network_role + get_input: port_cmaui02_port_2_network_role fixed_ips: get_input: - - port_cmaui02_port_fixed_ips + - port_cmaui02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui02_port_subnetpoolid + get_input: port_cmaui02_port_2_subnetpoolid network: get_input: - - port_cmaui02_port_network + - port_cmaui02_port_2_network - index_value requirements: - binding: @@ -149,8 +149,8 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui capabilities: - network.incoming.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port + network.incoming.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - network.incoming.bytes disk.read.bytes.rate_cmaui: - cmaui @@ -161,9 +161,6 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes - forwarder_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - forwarder disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -179,9 +176,6 @@ topology_template: disk.device.allocation_cmaui: - cmaui - disk.device.allocation - feature_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - feature disk.read.bytes_cmaui: - cmaui - disk.read.bytes @@ -200,21 +194,21 @@ topology_template: disk.root.size_cmaui: - cmaui - disk.root.size + network.outpoing.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outpoing.packets memory.usage_cmaui: - cmaui - memory.usage os_cmaui: - cmaui - os + attachment_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - attachment disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - network.incoming.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets.rate - binding_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - binding disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -224,6 +218,9 @@ topology_template: disk.device.latency_cmaui: - cmaui - disk.device.latency + network.incoming.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.bytes.rate disk.device.read.requests_cmaui: - cmaui - disk.device.read.requests @@ -233,33 +230,42 @@ topology_template: cpu_cmaui: - cmaui - cpu - network.outgoing.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.packets.rate disk.read.requests_cmaui: - cmaui - disk.read.requests disk.device.read.bytes_cmaui: - cmaui - disk.device.read.bytes + forwarder_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - forwarder disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests + network.incoming.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets + feature_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - feature + binding_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - binding + network.incoming.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets.rate vcpus_cmaui: - cmaui - vcpus feature_cmaui: - cmaui - feature - network.incoming.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets + network.outgoing.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.packets.rate binding_cmaui: - cmaui - binding - attachment_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - attachment endpoint_cmaui: - cmaui - endpoint @@ -275,49 +281,43 @@ topology_template: disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate - network.outgoing.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes disk.usage_cmaui: - cmaui - disk.usage + network.outgoing.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes.rate disk.latency_cmaui: - cmaui - disk.latency - network.outgoing.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes.rate instance_cmaui: - cmaui - instance disk.allocation_cmaui: - cmaui - disk.allocation - network.incoming.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.bytes.rate + network.outgoing.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes disk.write.bytes_cmaui: - cmaui - disk.write.bytes cpu_util_cmaui: - cmaui - cpu_util - network.outpoing.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outpoing.packets disk.device.write.requests.rate_cmaui: - cmaui - disk.device.write.requests.rate requirements: - dependency_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - dependency - link_cmaui_cmaui02_port: - - cmaui_cmaui02_port + link_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - link + dependency_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - dependency dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage
\ No newline at end of file + - local_storage |