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/mixPatterns/dependencyConnectivity/out/Nested_pcma_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/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml')
1 files changed, 160 insertions, 160 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index 3b3e7bc0ed..3397b00ba8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -11,36 +11,40 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_2_network_role: + port_pcm_port_2_0_subnetpoolid: type: string required: true - port_pcm_port_2_fixed_ips: + port_pcm_port_2_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_3_network_role: - type: string + type: json + port_pcm_port_2_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_3_vlan_requirements: + port_pcm_port_2_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_3_0_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_pcm_port_3_security_groups: + port_pcm_port_3_0_ip_requirements: type: list required: true entry_schema: - type: json - port_pcm_port_3_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_3_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcma_server_availability_zone: type: list required: true @@ -49,51 +53,40 @@ topology_template: vm_image_name: type: string required: true - port_pcm_port_2_security_groups: + port_pcm_port_3_0_security_groups: type: list required: true entry_schema: type: json - port_pcm_port_2_exCP_naming: + port_pcm_port_2_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_3_ip_requirements: + port_pcm_port_2_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_2_subnetpoolid: - type: string - required: true - port_pcm_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_2_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_3_subnetpoolid: + type: string + port_pcm_port_2_0_network_role_tag: type: string required: true - port_pcm_port_3_network_role_tag: + port_pcm_port_3_0_network_role_tag: type: string required: true - compute_pcma_server_config_drive: + port_pcm_port_3_0_vlan_requirements: type: list required: true entry_schema: - type: boolean - port_pcm_port_3_fixed_ips: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_2_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_3_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + compute_pcma_server_config_drive: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -106,35 +99,36 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_2_order: - type: integer - required: true - port_pcm_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_2_network: + port_pcm_port_3_0_network: type: list required: true entry_schema: type: string - port_pcm_port_2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_2_network_role_tag: + port_pcm_port_2_0_network_role: type: string required: true - port_pcm_port_2_related_networks: + port_pcm_port_2_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pcm_port_3_network: + port_pcm_port_2_0_fixed_ips: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_0_order: + type: integer + required: true + port_pcm_port_3_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_3_0_subnetpoolid: + type: string + required: true + port_pcm_port_3_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pcma_server_scheduler_hints: type: list required: true @@ -145,6 +139,12 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_3_0_network_role: + type: string + required: true + port_pcm_port_3_0_order: + type: integer + required: true node_templates: pcma_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pcma_server @@ -173,78 +173,78 @@ topology_template: get_input: - compute_pcma_server_user_data_format - index_value - pcma_server_pcm_port_3: + pcma_server_pcm_port_2_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_3_mac_requirements + get_input: port_pcm_port_2_0_mac_requirements order: - get_input: port_pcm_port_3_order + get_input: port_pcm_port_2_0_order security_groups: get_input: - - port_pcm_port_3_security_groups + - port_pcm_port_2_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_3_exCP_naming + get_input: port_pcm_port_2_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_3_vlan_requirements + get_input: port_pcm_port_2_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_3_ip_requirements + get_input: port_pcm_port_2_0_ip_requirements related_networks: - get_input: port_pcm_port_3_related_networks + get_input: port_pcm_port_2_0_related_networks network_role_tag: - get_input: port_pcm_port_3_network_role_tag + get_input: port_pcm_port_2_0_network_role_tag network_role: - get_input: port_pcm_port_3_network_role + get_input: port_pcm_port_2_0_network_role fixed_ips: get_input: - - port_pcm_port_3_fixed_ips + - port_pcm_port_2_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_3_subnetpoolid + get_input: port_pcm_port_2_0_subnetpoolid network: get_input: - - port_pcm_port_3_network + - port_pcm_port_2_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pcma_server relationship: tosca.relationships.network.BindsTo - pcma_server_pcm_port_2: + pcma_server_pcm_port_3_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_2_mac_requirements + get_input: port_pcm_port_3_0_mac_requirements order: - get_input: port_pcm_port_2_order + get_input: port_pcm_port_3_0_order security_groups: get_input: - - port_pcm_port_2_security_groups + - port_pcm_port_3_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_2_exCP_naming + get_input: port_pcm_port_3_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_2_vlan_requirements + get_input: port_pcm_port_3_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_2_ip_requirements + get_input: port_pcm_port_3_0_ip_requirements related_networks: - get_input: port_pcm_port_2_related_networks + get_input: port_pcm_port_3_0_related_networks network_role_tag: - get_input: port_pcm_port_2_network_role_tag + get_input: port_pcm_port_3_0_network_role_tag network_role: - get_input: port_pcm_port_2_network_role + get_input: port_pcm_port_3_0_network_role fixed_ips: get_input: - - port_pcm_port_2_fixed_ips + - port_pcm_port_3_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_2_subnetpoolid + get_input: port_pcm_port_3_0_subnetpoolid network: get_input: - - port_pcm_port_2_network + - port_pcm_port_3_0_network - index_value requirements: - binding: @@ -257,6 +257,18 @@ topology_template: cpu.delta_pcma_server: - pcma_server - cpu.delta + network.incoming.packets_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.packets + network.outgoing.packets.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.outgoing.bytes.rate scalable_pcma_server: - pcma_server - scalable @@ -269,99 +281,69 @@ topology_template: disk.device.read.requests.rate_pcma_server: - pcma_server - disk.device.read.requests.rate + network.outpoing.packets_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.outpoing.packets disk.usage_pcma_server: - pcma_server - disk.usage - network.outgoing.bytes.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.outgoing.bytes.rate disk.read.bytes_pcma_server: - pcma_server - disk.read.bytes disk.iops_pcma_server: - pcma_server - disk.iops - network.outgoing.bytes.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outgoing.bytes.rate - attachment_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - attachment endpoint_pcma_server: - pcma_server - endpoint feature_pcma_server: - pcma_server - feature - attachment_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - attachment - network.incoming.bytes.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.bytes.rate + binding_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - binding memory.usage_pcma_server: - pcma_server - memory.usage - network.outgoing.bytes_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 + network.outgoing.bytes_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 - network.outgoing.bytes - binding_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - binding - network.incoming.bytes.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.bytes.rate + feature_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - feature memory_pcma_server: - pcma_server - memory - network.outgoing.bytes_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outgoing.bytes + forwarder_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - forwarder cpu_pcma_server: - pcma_server - cpu disk.device.write.bytes.rate_pcma_server: - pcma_server - disk.device.write.bytes.rate + network.incoming.packets.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.packets.rate disk.read.bytes.rate_pcma_server: - pcma_server - disk.read.bytes.rate - network.incoming.packets_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.packets - binding_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - binding os_pcma_server: - pcma_server - os - network.incoming.packets_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.packets - network.incoming.packets.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.packets.rate - network.outgoing.packets.rate_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.outgoing.packets.rate - network.incoming.packets.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.packets.rate - forwarder_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - forwarder + network.incoming.bytes_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.bytes disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests - forwarder_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - forwarder + attachment_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - attachment disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate - network.outgoing.packets.rate_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outgoing.packets.rate disk.device.write.requests.rate_pcma_server: - pcma_server - disk.device.write.requests.rate @@ -383,12 +365,21 @@ topology_template: disk.allocation_pcma_server: - pcma_server - disk.allocation - feature_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - feature - feature_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - feature + network.outgoing.packets.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.incoming.bytes.rate + network.incoming.packets_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.packets + network.outgoing.bytes.rate_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outgoing.bytes.rate + network.outpoing.packets_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outpoing.packets disk.ephemeral.size_pcma_server: - pcma_server - disk.ephemeral.size @@ -413,36 +404,45 @@ topology_template: disk.root.size_pcma_server: - pcma_server - disk.root.size + forwarder_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - forwarder + binding_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - binding disk.write.bytes_pcma_server: - pcma_server - disk.write.bytes + network.outgoing.bytes_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - network.outgoing.bytes disk.write.requests_pcma_server: - pcma_server - disk.write.requests - network.incoming.bytes_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.incoming.bytes - network.incoming.bytes_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.incoming.bytes + feature_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - feature + network.incoming.packets.rate_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.packets.rate disk.write.requests.rate_pcma_server: - pcma_server - disk.write.requests.rate + network.incoming.bytes_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - network.incoming.bytes disk.device.iops_pcma_server: - pcma_server - disk.device.iops instance_pcma_server: - pcma_server - instance - network.outpoing.packets_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - network.outpoing.packets + attachment_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - attachment disk.device.latency_pcma_server: - pcma_server - disk.device.latency - network.outpoing.packets_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - network.outpoing.packets disk.capacity_pcma_server: - pcma_server - disk.capacity @@ -450,21 +450,21 @@ topology_template: - pcma_server - disk.device.capacity requirements: - dependency_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - dependency dependency_pcma_server: - pcma_server - dependency - dependency_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 - - dependency local_storage_pcma_server: - pcma_server - local_storage - link_pcma_server_pcm_port_2: - - pcma_server_pcm_port_2 + link_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - link + link_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 - link - link_pcma_server_pcm_port_3: - - pcma_server_pcm_port_3 - - link
\ No newline at end of file + dependency_pcma_server_pcm_port_2_0: + - pcma_server_pcm_port_2_0 + - dependency + dependency_pcma_server_pcm_port_3_0: + - pcma_server_pcm_port_3_0 + - dependency
\ No newline at end of file |