From b8e2faf476202b6ffe61bc3a9a37df1304881d40 Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Tue, 18 Jul 2017 19:45:38 +0300 Subject: [SDC] Onboarding 1710 rebase. Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535 Signed-off-by: Avi Ziv --- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 589 +++++++++++---------- 1 file changed, 295 insertions(+), 294 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index d03bd42f52..a2031c2812 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -6,11 +6,6 @@ imports: file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - org.openecomp.resource.vfc.nodes.heat.pcm_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: pd_flavor_name: @@ -110,82 +105,90 @@ topology_template: type: string description: OAM network name node_templates: - pcm_port_1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + abstract_pcm_server: + type: org.openecomp.resource.abstract.nodes.pcm_server + directives: + - substitutable properties: - ip_requirements: + compute_pcm_server_availability_zone: + - get_input: availabilityzone_name + port_pcm_port_fixed_ips: + - ip_address: + get_input: cps_net_ip + port_pcm_port_network_role_tag: cps + vm_flavor_name: + get_input: pcm_flavor_name + port_pcm_port_mac_requirements: + mac_count_required: + is_required: false + compute_pcm_server_name: + - get_input: pcm_server_name + port_pcm_port_network: + - get_input: cps_net_name + port_pcm_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - security_groups: - - get_input: security_group_name - fixed_ips: + compute_pcm_server_user_data_format: + - RAW + vm_image_name: + get_input: pcm_image_name + compute_pcm_server_config_drive: + - true + port_pcm_port_security_groups: + - - get_input: security_group_name + service_template_filter: + substitute_service_template: Nested_pcm_serverServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: pd_server_name + port_pcm_port_fixed_ips: - ip_address: get_input: oam_net_ip - mac_requirements: + port_pcm_port_network_role_tag: oam + vm_flavor_name: + get_input: pd_flavor_name + port_pcm_port_mac_requirements: mac_count_required: is_required: false - network_role_tag: oam - network: - get_input: oam_net_name - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_pd_0 - relationship: tosca.relationships.network.BindsTo - server_pcm_0: - type: org.openecomp.resource.vfc.nodes.heat.pcm_server - properties: - flavor: - get_input: pcm_flavor_name - availability_zone: - get_input: availabilityzone_name - image: - get_input: pcm_image_name - config_drive: true - user_data_format: RAW - name: - get_input: pcm_server_name - server_pd_0: - type: org.openecomp.resource.vfc.nodes.heat.pd_server - properties: - flavor: - get_input: pd_flavor_name - availability_zone: - get_input: availabilityzone_name - image: - get_input: pd_image_name - config_drive: true - user_data_format: RAW - name: - get_input: pd_server_name - pcm_port_0: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - ip_requirements: + port_pcm_port_network: + - get_input: oam_net_name + port_pcm_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: cps_net_ip - mac_requirements: - mac_count_required: - is_required: false - network_role_tag: cps - network: - get_input: cps_net_name - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_pcm_0 - relationship: tosca.relationships.network.BindsTo + vm_image_name: + get_input: pd_image_name + compute_pd_server_config_drive: + - true + compute_pd_server_user_data_format: + - RAW + port_pcm_port_security_groups: + - - get_input: security_group_name + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value groups: nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack @@ -193,10 +196,8 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.1.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - - server_pcm_0 - - server_pd_0 - - pcm_port_0 + - abstract_pd_server + - abstract_pcm_server outputs: server_pcm_id_2: description: the pcm nova service id @@ -208,339 +209,339 @@ topology_template: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate + - abstract_pcm_server + - network.incoming.packets.rate_pcm_server_pcm_port disk.iops_server_pd_0: - - server_pd_0 - - disk.iops + - abstract_pd_server + - disk.iops_pd_server network.incoming.packets.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.packets.rate + - abstract_pd_server + - network.incoming.packets.rate_pd_server_pcm_port network.outpoing.packets_pcm_port_1: - - pcm_port_1 - - network.outpoing.packets + - abstract_pd_server + - network.outpoing.packets_pd_server_pcm_port network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + - abstract_pcm_server + - network.outpoing.packets_pcm_server_pcm_port disk.write.bytes.rate_server_pd_0: - - server_pd_0 - - disk.write.bytes.rate + - abstract_pd_server + - disk.write.bytes.rate_pd_server cpu.delta_server_pd_0: - - server_pd_0 - - cpu.delta + - abstract_pd_server + - cpu.delta_pd_server feature_server_pd_0: - - server_pd_0 - - feature + - abstract_pd_server + - feature_pd_server disk.capacity_server_pcm_0: - - server_pcm_0 - - disk.capacity + - abstract_pcm_server + - disk.capacity_pcm_server host_server_pd_0: - - server_pd_0 - - host + - abstract_pd_server + - host_pd_server memory_server_pd_0: - - server_pd_0 - - memory + - abstract_pd_server + - memory_pd_server network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes + - abstract_pcm_server + - network.incoming.bytes_pcm_server_pcm_port network.incoming.bytes_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes + - abstract_pd_server + - network.incoming.bytes_pd_server_pcm_port disk.usage_server_pcm_0: - - server_pcm_0 - - disk.usage + - abstract_pcm_server + - disk.usage_pcm_server binding_pcm_port_0: - - pcm_port_0 - - binding + - abstract_pcm_server + - binding_pcm_server_pcm_port binding_pcm_port_1: - - pcm_port_1 - - binding + - abstract_pd_server + - binding_pd_server_pcm_port vcpus_server_pcm_0: - - server_pcm_0 - - vcpus + - abstract_pcm_server + - vcpus_pcm_server memory.resident_server_pcm_0: - - server_pcm_0 - - memory.resident + - abstract_pcm_server + - memory.resident_pcm_server disk.write.requests_server_pd_0: - - server_pd_0 - - disk.write.requests + - abstract_pd_server + - disk.write.requests_pd_server feature_server_pcm_0: - - server_pcm_0 - - feature + - abstract_pcm_server + - feature_pcm_server network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.packets.rate + - abstract_pcm_server + - network.outgoing.packets.rate_pcm_server_pcm_port network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.packets.rate + - abstract_pd_server + - network.outgoing.packets.rate_pd_server_pcm_port feature_pcm_port_1: - - pcm_port_1 - - feature + - abstract_pd_server + - feature_pd_server_pcm_port disk.ephemeral.size_server_pd_0: - - server_pd_0 - - disk.ephemeral.size + - abstract_pd_server + - disk.ephemeral.size_pd_server network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes + - abstract_pcm_server + - network.outgoing.bytes_pcm_server_pcm_port feature_pcm_port_0: - - pcm_port_0 - - feature + - abstract_pcm_server + - feature_pcm_server_pcm_port network.outgoing.bytes_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes + - abstract_pd_server + - network.outgoing.bytes_pd_server_pcm_port cpu_server_pcm_0: - - server_pcm_0 - - cpu + - abstract_pcm_server + - cpu_pcm_server attachment_pcm_port_0: - - pcm_port_0 - - attachment + - abstract_pcm_server + - attachment_pcm_server_pcm_port attachment_pcm_port_1: - - pcm_port_1 - - attachment + - abstract_pd_server + - attachment_pd_server_pcm_port disk.write.bytes_server_pd_0: - - server_pd_0 - - disk.write.bytes + - abstract_pd_server + - disk.write.bytes_pd_server disk.read.requests_server_pd_0: - - server_pd_0 - - disk.read.requests + - abstract_pd_server + - disk.read.requests_pd_server disk.device.usage_server_pd_0: - - server_pd_0 - - disk.device.usage + - abstract_pd_server + - disk.device.usage_pd_server disk.device.read.bytes_server_pd_0: - - server_pd_0 - - disk.device.read.bytes + - abstract_pd_server + - disk.device.read.bytes_pd_server endpoint_server_pcm_0: - - server_pcm_0 - - endpoint + - abstract_pcm_server + - endpoint_pcm_server host_server_pcm_0: - - server_pcm_0 - - host + - abstract_pcm_server + - host_pcm_server disk.write.requests.rate_server_pd_0: - - server_pd_0 - - disk.write.requests.rate + - abstract_pd_server + - disk.write.requests.rate_pd_server disk.device.capacity_server_pcm_0: - - server_pcm_0 - - disk.device.capacity + - abstract_pcm_server + - disk.device.capacity_pcm_server disk.root.size_server_pd_0: - - server_pd_0 - - disk.root.size + - abstract_pd_server + - disk.root.size_pd_server disk.latency_server_pcm_0: - - server_pcm_0 - - disk.latency + - abstract_pcm_server + - disk.latency_pcm_server disk.device.iops_server_pd_0: - - server_pd_0 - - disk.device.iops + - abstract_pd_server + - disk.device.iops_pd_server disk.write.requests.rate_server_pcm_0: - - server_pcm_0 - - disk.write.requests.rate + - abstract_pcm_server + - disk.write.requests.rate_pcm_server memory_server_pcm_0: - - server_pcm_0 - - memory + - abstract_pcm_server + - memory_pcm_server disk.device.read.bytes.rate_server_pcm_0: - - server_pcm_0 - - disk.device.read.bytes.rate + - abstract_pcm_server + - disk.device.read.bytes.rate_pcm_server instance_server_pcm_0: - - server_pcm_0 - - instance + - abstract_pcm_server + - instance_pcm_server disk.device.allocation_server_pcm_0: - - server_pcm_0 - - disk.device.allocation + - abstract_pcm_server + - disk.device.allocation_pcm_server disk.usage_server_pd_0: - - server_pd_0 - - disk.usage + - abstract_pd_server + - disk.usage_pd_server disk.write.bytes_server_pcm_0: - - server_pcm_0 - - disk.write.bytes + - abstract_pcm_server + - disk.write.bytes_pcm_server disk.device.read.requests.rate_server_pcm_0: - - server_pcm_0 - - disk.device.read.requests.rate + - abstract_pcm_server + - disk.device.read.requests.rate_pcm_server binding_server_pcm_0: - - server_pcm_0 - - binding + - abstract_pcm_server + - binding_pcm_server disk.read.bytes.rate_server_pd_0: - - server_pd_0 - - disk.read.bytes.rate + - abstract_pd_server + - disk.read.bytes.rate_pd_server disk.write.bytes.rate_server_pcm_0: - - server_pcm_0 - - disk.write.bytes.rate + - abstract_pcm_server + - disk.write.bytes.rate_pcm_server cpu_server_pd_0: - - server_pd_0 - - cpu + - abstract_pd_server + - cpu_pd_server disk.root.size_server_pcm_0: - - server_pcm_0 - - disk.root.size + - abstract_pcm_server + - disk.root.size_pcm_server vcpus_server_pd_0: - - server_pd_0 - - vcpus + - abstract_pd_server + - vcpus_pd_server disk.iops_server_pcm_0: - - server_pcm_0 - - disk.iops + - abstract_pcm_server + - disk.iops_pcm_server endpoint_server_pd_0: - - server_pd_0 - - endpoint + - abstract_pd_server + - endpoint_pd_server disk.device.write.bytes.rate_server_pd_0: - - server_pd_0 - - disk.device.write.bytes.rate + - abstract_pd_server + - disk.device.write.bytes.rate_pd_server disk.device.capacity_server_pd_0: - - server_pd_0 - - disk.device.capacity + - abstract_pd_server + - disk.device.capacity_pd_server disk.device.write.bytes.rate_server_pcm_0: - - server_pcm_0 - - disk.device.write.bytes.rate + - abstract_pcm_server + - disk.device.write.bytes.rate_pcm_server disk.write.requests_server_pcm_0: - - server_pcm_0 - - disk.write.requests + - abstract_pcm_server + - disk.write.requests_pcm_server disk.read.bytes_server_pcm_0: - - server_pcm_0 - - disk.read.bytes + - abstract_pcm_server + - disk.read.bytes_pcm_server disk.device.latency_server_pd_0: - - server_pd_0 - - disk.device.latency + - abstract_pd_server + - disk.device.latency_pd_server cpu_util_server_pcm_0: - - server_pcm_0 - - cpu_util + - abstract_pcm_server + - cpu_util_pcm_server disk.device.read.requests.rate_server_pd_0: - - server_pd_0 - - disk.device.read.requests.rate + - abstract_pd_server + - disk.device.read.requests.rate_pd_server disk.device.write.bytes_server_pcm_0: - - server_pcm_0 - - disk.device.write.bytes + - abstract_pcm_server + - disk.device.write.bytes_pcm_server disk.allocation_server_pcm_0: - - server_pcm_0 - - disk.allocation + - abstract_pcm_server + - disk.allocation_pcm_server memory.usage_server_pcm_0: - - server_pcm_0 - - memory.usage + - abstract_pcm_server + - memory.usage_pcm_server instance_server_pd_0: - - server_pd_0 - - instance + - abstract_pd_server + - instance_pd_server disk.allocation_server_pd_0: - - server_pd_0 - - disk.allocation + - abstract_pd_server + - disk.allocation_pd_server disk.device.read.bytes_server_pcm_0: - - server_pcm_0 - - disk.device.read.bytes + - abstract_pcm_server + - disk.device.read.bytes_pcm_server cpu_util_server_pd_0: - - server_pd_0 - - cpu_util + - abstract_pd_server + - cpu_util_pd_server disk.read.bytes.rate_server_pcm_0: - - server_pcm_0 - - disk.read.bytes.rate + - abstract_pcm_server + - disk.read.bytes.rate_pcm_server disk.device.iops_server_pcm_0: - - server_pcm_0 - - disk.device.iops + - abstract_pcm_server + - disk.device.iops_pcm_server disk.device.write.bytes_server_pd_0: - - server_pd_0 - - disk.device.write.bytes + - abstract_pd_server + - disk.device.write.bytes_pd_server disk.capacity_server_pd_0: - - server_pd_0 - - disk.capacity + - abstract_pd_server + - disk.capacity_pd_server disk.device.read.bytes.rate_server_pd_0: - - server_pd_0 - - disk.device.read.bytes.rate + - abstract_pd_server + - disk.device.read.bytes.rate_pd_server cpu.delta_server_pcm_0: - - server_pcm_0 - - cpu.delta + - abstract_pcm_server + - cpu.delta_pcm_server memory.resident_server_pd_0: - - server_pd_0 - - memory.resident + - abstract_pd_server + - memory.resident_pd_server disk.ephemeral.size_server_pcm_0: - - server_pcm_0 - - disk.ephemeral.size + - abstract_pcm_server + - disk.ephemeral.size_pcm_server disk.read.requests_server_pcm_0: - - server_pcm_0 - - disk.read.requests + - abstract_pcm_server + - disk.read.requests_pcm_server disk.device.write.requests.rate_server_pcm_0: - - server_pcm_0 - - disk.device.write.requests.rate + - abstract_pcm_server + - disk.device.write.requests.rate_pcm_server disk.device.write.requests_server_pd_0: - - server_pd_0 - - disk.device.write.requests + - abstract_pd_server + - disk.device.write.requests_pd_server binding_server_pd_0: - - server_pd_0 - - binding + - abstract_pd_server + - binding_pd_server scalable_server_pcm_0: - - server_pcm_0 - - scalable + - abstract_pcm_server + - scalable_pcm_server disk.device.allocation_server_pd_0: - - server_pd_0 - - disk.device.allocation + - abstract_pd_server + - disk.device.allocation_pd_server disk.read.bytes_server_pd_0: - - server_pd_0 - - disk.read.bytes + - abstract_pd_server + - disk.read.bytes_pd_server disk.device.read.requests_server_pd_0: - - server_pd_0 - - disk.device.read.requests + - abstract_pd_server + - disk.device.read.requests_pd_server network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate + - abstract_pd_server + - network.outgoing.bytes.rate_pd_server_pcm_port network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets + - abstract_pcm_server + - network.incoming.packets_pcm_server_pcm_port disk.device.latency_server_pcm_0: - - server_pcm_0 - - disk.device.latency + - abstract_pcm_server + - disk.device.latency_pcm_server disk.device.usage_server_pcm_0: - - server_pcm_0 - - disk.device.usage + - abstract_pcm_server + - disk.device.usage_pcm_server disk.latency_server_pd_0: - - server_pd_0 - - disk.latency + - abstract_pd_server + - disk.latency_pd_server network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate + - abstract_pcm_server + - network.outgoing.bytes.rate_pcm_server_pcm_port memory.usage_server_pd_0: - - server_pd_0 - - memory.usage + - abstract_pd_server + - memory.usage_pd_server network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets + - abstract_pd_server + - network.incoming.packets_pd_server_pcm_port disk.device.write.requests_server_pcm_0: - - server_pcm_0 - - disk.device.write.requests + - abstract_pcm_server + - disk.device.write.requests_pcm_server disk.device.write.requests.rate_server_pd_0: - - server_pd_0 - - disk.device.write.requests.rate + - abstract_pd_server + - disk.device.write.requests.rate_pd_server disk.device.read.requests_server_pcm_0: - - server_pcm_0 - - disk.device.read.requests + - abstract_pcm_server + - disk.device.read.requests_pcm_server scalable_server_pd_0: - - server_pd_0 - - scalable + - abstract_pd_server + - scalable_pd_server os_server_pcm_0: - - server_pcm_0 - - os + - abstract_pcm_server + - os_pcm_server network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate + - abstract_pcm_server + - network.incoming.bytes.rate_pcm_server_pcm_port network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + - abstract_pd_server + - network.incoming.bytes.rate_pd_server_pcm_port os_server_pd_0: - - server_pd_0 - - os + - abstract_pd_server + - os_pd_server requirements: dependency_server_pcm_0: - - server_pcm_0 - - dependency + - abstract_pcm_server + - dependency_pcm_server local_storage_server_pcm_0: - - server_pcm_0 - - local_storage + - abstract_pcm_server + - local_storage_pcm_server link_pcm_port_0: - - pcm_port_0 - - link + - abstract_pcm_server + - link_pcm_server_pcm_port link_pcm_port_1: - - pcm_port_1 - - link + - abstract_pd_server + - link_pd_server_pcm_port dependency_pcm_port_0: - - pcm_port_0 - - dependency + - abstract_pcm_server + - dependency_pcm_server_pcm_port local_storage_server_pd_0: - - server_pd_0 - - local_storage + - abstract_pd_server + - local_storage_pd_server dependency_server_pd_0: - - server_pd_0 - - dependency + - abstract_pd_server + - dependency_pd_server dependency_pcm_port_1: - - pcm_port_1 - - dependency + - abstract_pd_server + - dependency_pd_server_pcm_port -- cgit 1.2.3-korg