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/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.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/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml')
1 files changed, 96 insertions, 96 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..5548e79a3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_03_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +37,12 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_03_vlan_requirements: + type: list required: true - port_pd01_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_03_related_networks: type: list required: true entry_schema: @@ -39,98 +50,90 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd01_port_03_subnetpoolid: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_03_order: + type: integer required: true - port_pd01_port_vlan_requirements: + port_pd01_port_03_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd01_port_03_network_role_tag: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_03: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_03_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_03_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_03_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_03_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_03_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_03_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_03_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_03_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_03_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_03_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + network.outgoing.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outpoing.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + feature_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - feature disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +185,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +197,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment + network.incoming.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes disk.capacity_pd_server: - pd_server - disk.capacity @@ -215,27 +212,33 @@ topology_template: binding_pd_server: - pd_server - binding + binding_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes.rate + attachment_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - attachment feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,24 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + forwarder_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - forwarder disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.incoming.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_03: + - pd_server_pd01_port_03 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - link |