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/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.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/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.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/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index 82f94141bf..f97da8b6bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -16,9 +16,11 @@ topology_template: required: true entry_schema: type: string - port_compute_port_subnetpoolid: - type: string + port_compute_port_0_network: + type: list required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,56 +28,54 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_compute_port_vlan_requirements: + compute_compute_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_compute_name: + type: string + port_compute_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_compute_port_network_role: - type: string + port_compute_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true + port_compute_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_compute_port_network: - type: list + port_compute_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string - port_compute_port_related_networks: + port_compute_port_0_subnetpoolid: + type: string + required: true + port_compute_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_compute_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_compute_metadata: type: list required: true entry_schema: type: json - port_compute_port_order: - type: integer - required: true - port_compute_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_compute_port_0_network_role: + type: string required: true - port_compute_port_ip_requirements: - type: list + port_compute_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_compute_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_compute_port_0_order: + type: integer required: true node_templates: compute: @@ -89,7 +89,7 @@ topology_template: - index_value config_drive: get_attribute: - - compute_compute_port + - compute_compute_port_0 - tenant_id - port_security_enabled - device_id @@ -115,31 +115,31 @@ topology_template: get_input: - compute_compute_user_data_format - index_value - compute_compute_port: + compute_compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_compute_port_exCP_naming + get_input: port_compute_port_0_exCP_naming vlan_requirements: - get_input: port_compute_port_vlan_requirements + get_input: port_compute_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_compute_port_related_networks + get_input: port_compute_port_0_related_networks ip_requirements: - get_input: port_compute_port_ip_requirements + get_input: port_compute_port_0_ip_requirements network_role_tag: - get_input: port_compute_port_network_role_tag + get_input: port_compute_port_0_network_role_tag mac_requirements: - get_input: port_compute_port_mac_requirements + get_input: port_compute_port_0_mac_requirements order: - get_input: port_compute_port_order + get_input: port_compute_port_0_order network_role: - get_input: port_compute_port_network_role + get_input: port_compute_port_0_network_role subnetpoolid: - get_input: port_compute_port_subnetpoolid + get_input: port_compute_port_0_subnetpoolid network: get_input: - - port_compute_port_network + - port_compute_port_0_network - index_value requirements: - binding: @@ -149,15 +149,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.compute capabilities: + attachment_compute_compute_port_0: + - compute_compute_port_0 + - attachment disk.write.requests_compute: - compute - disk.write.requests disk.latency_compute: - compute - disk.latency - network.incoming.bytes_compute_compute_port: - - compute_compute_port - - network.incoming.bytes disk.root.size_compute: - compute - disk.root.size @@ -167,6 +167,12 @@ topology_template: disk.read.requests_compute: - compute - disk.read.requests + binding_compute_compute_port_0: + - compute_compute_port_0 + - binding + network.incoming.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes os_compute: - compute - os @@ -176,30 +182,36 @@ topology_template: vcpus_compute: - compute - vcpus + forwarder_compute_compute_port_0: + - compute_compute_port_0 + - forwarder + network.outgoing.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes.rate disk.device.iops_compute: - compute - disk.device.iops - network.incoming.bytes.rate_compute_compute_port: - - compute_compute_port - - network.incoming.bytes.rate disk.device.write.requests.rate_compute: - compute - disk.device.write.requests.rate - attachment_compute_compute_port: - - compute_compute_port - - attachment host_compute: - compute - host + network.incoming.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets.rate + feature_compute_compute_port_0: + - compute_compute_port_0 + - feature disk.device.write.bytes_compute: - compute - disk.device.write.bytes cpu_compute: - compute - cpu - binding_compute_compute_port: - - compute_compute_port - - binding disk.allocation_compute: - compute - disk.allocation @@ -209,21 +221,15 @@ topology_template: binding_compute: - compute - binding - feature_compute_compute_port: - - compute_compute_port - - feature disk.device.usage_compute: - compute - disk.device.usage - forwarder_compute_compute_port: - - compute_compute_port - - forwarder - network.incoming.packets_compute_compute_port: - - compute_compute_port - - network.incoming.packets instance_compute: - compute - instance + network.outpoing.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.outpoing.packets disk.ephemeral.size_compute: - compute - disk.ephemeral.size @@ -239,9 +245,6 @@ topology_template: disk.iops_compute: - compute - disk.iops - network.incoming.packets.rate_compute_compute_port: - - compute_compute_port - - network.incoming.packets.rate disk.device.read.requests.rate_compute: - compute - disk.device.read.requests.rate @@ -251,15 +254,18 @@ topology_template: disk.device.read.bytes_compute: - compute - disk.device.read.bytes + network.incoming.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets disk.write.bytes_compute: - compute - disk.write.bytes disk.usage_compute: - compute - disk.usage - network.outgoing.bytes.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes.rate + network.outgoing.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes disk.capacity_compute: - compute - disk.capacity @@ -275,12 +281,6 @@ topology_template: disk.device.write.requests_compute: - compute - disk.device.write.requests - network.outgoing.packets.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.packets.rate - network.outgoing.bytes_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes endpoint_compute: - compute - endpoint @@ -296,9 +296,6 @@ topology_template: scalable_compute: - compute - scalable - network.outpoing.packets_compute_compute_port: - - compute_compute_port - - network.outpoing.packets disk.device.read.requests_compute: - compute - disk.device.read.requests @@ -308,16 +305,19 @@ topology_template: disk.device.allocation_compute: - compute - disk.device.allocation + network.outgoing.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes.rate requirements: local_storage_compute: - compute - local_storage - dependency_compute_compute_port: - - compute_compute_port - - dependency - link_compute_compute_port: - - compute_compute_port + link_compute_compute_port_0: + - compute_compute_port_0 - link dependency_compute: - compute - - dependency
\ No newline at end of file + - dependency + dependency_compute_compute_port_0: + - compute_compute_port_0 + - dependency |