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 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 2 +- .../out/MainServiceTemplate.yaml | 34 +-- .../out/Nested_pd_serverServiceTemplate.yaml | 289 +++++++++++++++++++++ .../out/Nested_pd_server_0ServiceTemplate.yaml | 289 --------------------- 4 files changed, 307 insertions(+), 307 deletions(-) create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml delete mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 44ad0fecd5..8a723e741d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,7 +5,7 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.pd_server_0: + org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: index_value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 46f451d8a2..217da7b6a9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -185,8 +185,8 @@ topology_template: network_role_tag: oam network: get_input: oam_net_name - abstract_pd_server_2: - type: org.openecomp.resource.abstract.nodes.pd_server_2 + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server directives: - substitutable properties: @@ -195,7 +195,7 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 2 + - 1 vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: @@ -209,26 +209,18 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: - substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml + substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value - network_policy_server: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - name: - get_input: dummy_net_name_1 - abstract_pd_server_0: - type: org.openecomp.resource.abstract.nodes.pd_server_0 + abstract_pd_server_2: + type: org.openecomp.resource.abstract.nodes.pd_server_2 directives: - substitutable properties: @@ -237,7 +229,7 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 1 + - 2 vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: @@ -251,16 +243,24 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_network: + - get_input: oam_net_name + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: - substitute_service_template: Nested_pd_server_0ServiceTemplate.yaml + substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value + network_policy_server: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_input: dummy_net_name_1 abstract_pd_server_1: type: org.openecomp.resource.abstract.nodes.pd_server_1 directives: @@ -304,6 +304,6 @@ topology_template: members: - pd01_port_3 - network_policy_server - - abstract_pd_server_0 + - abstract_pd_server - abstract_pd_server_1 - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml new file mode 100644 index 0000000000..06cdbd86fe --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml @@ -0,0 +1,289 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Nested_pd_server +imports: +- openecomp_heat_index: + 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 +topology_template: + inputs: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list + required: true + entry_schema: + type: string + compute_pd_server_name: + type: list + required: true + entry_schema: + type: string + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + 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: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_order: + type: integer + required: true + port_pd01_port_subnetpoolid: + type: string + required: true + port_pd01_port_network_role: + type: string + required: true + port_pd01_port_network_role_tag: + type: string + required: true + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string + node_templates: + pd_server: + type: org.openecomp.resource.vfc.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: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_pd01_port_exCP_naming + vlan_requirements: + get_input: port_pd01_port_vlan_requirements + ip_requirements: + get_input: port_pd01_port_ip_requirements + network_role_tag: + get_input: port_pd01_port_network_role_tag + mac_requirements: + get_input: port_pd01_port_mac_requirements + order: + get_input: port_pd01_port_order + network_role: + get_input: port_pd01_port_network_role + subnetpoolid: + get_input: port_pd01_port_subnetpoolid + network: + get_attribute: + - pd_server + - accessIPv4 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: pd_server + relationship: tosca.relationships.network.BindsTo + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.pd_server + capabilities: + scalable_pd_server: + - pd_server + - scalable + disk.read.bytes.rate_pd_server: + - pd_server + - disk.read.bytes.rate + memory.usage_pd_server: + - pd_server + - memory.usage + memory_pd_server: + - pd_server + - memory + 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 + 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 + cpu_util_pd_server: + - pd_server + - cpu_util + disk.device.write.requests.rate_pd_server: + - pd_server + - disk.device.write.requests.rate + disk.read.bytes_pd_server: + - pd_server + - disk.read.bytes + 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 + disk.iops_pd_server: + - pd_server + - disk.iops + memory.resident_pd_server: + - pd_server + - memory.resident + 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 + disk.device.write.bytes.rate_pd_server: + - pd_server + - disk.device.write.bytes.rate + disk.device.write.requests_pd_server: + - pd_server + - disk.device.write.requests + endpoint_pd_server: + - pd_server + - endpoint + attachment_pd_server_pd01_port: + - pd_server_pd01_port + - attachment + disk.capacity_pd_server: + - pd_server + - disk.capacity + disk.device.allocation_pd_server: + - pd_server + - disk.device.allocation + disk.allocation_pd_server: + - pd_server + - disk.allocation + binding_pd_server: + - pd_server + - binding + disk.read.requests_pd_server: + - pd_server + - disk.read.requests + 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 + disk.device.read.requests.rate_pd_server: + - pd_server + - disk.device.read.requests.rate + disk.root.size_pd_server: + - pd_server + - disk.root.size + disk.device.read.bytes_pd_server: + - pd_server + - disk.device.read.bytes + disk.device.write.bytes_pd_server: + - pd_server + - disk.device.write.bytes + disk.device.read.requests_pd_server: + - pd_server + - disk.device.read.requests + instance_pd_server: + - pd_server + - instance + host_pd_server: + - pd_server + - host + network.outpoing.packets_pd_server_pd01_port: + - pd_server_pd01_port + - network.outpoing.packets + disk.write.requests.rate_pd_server: + - pd_server + - disk.write.requests.rate + disk.ephemeral.size_pd_server: + - pd_server + - disk.ephemeral.size + disk.write.requests_pd_server: + - pd_server + - disk.write.requests + feature_pd_server_pd01_port: + - pd_server_pd01_port + - feature + disk.device.latency_pd_server: + - pd_server + - disk.device.latency + disk.latency_pd_server: + - pd_server + - disk.latency + 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 + requirements: + 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 + dependency_pd_server: + - pd_server + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml deleted file mode 100644 index a44d0824ee..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml +++ /dev/null @@ -1,289 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Nested_pd_server_0 -imports: -- openecomp_heat_index: - 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 -topology_template: - inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list - required: true - entry_schema: - type: string - compute_pd_server_name: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - 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: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string - node_templates: - pd_server: - type: org.openecomp.resource.vfc.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: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - exCP_naming: - get_input: port_pd01_port_exCP_naming - vlan_requirements: - get_input: port_pd01_port_vlan_requirements - ip_requirements: - get_input: port_pd01_port_ip_requirements - network_role_tag: - get_input: port_pd01_port_network_role_tag - mac_requirements: - get_input: port_pd01_port_mac_requirements - order: - get_input: port_pd01_port_order - network_role: - get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid - network: - get_attribute: - - pd_server - - accessIPv4 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: pd_server - relationship: tosca.relationships.network.BindsTo - substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.pd_server_0 - capabilities: - scalable_pd_server: - - pd_server - - scalable - disk.read.bytes.rate_pd_server: - - pd_server - - disk.read.bytes.rate - memory.usage_pd_server: - - pd_server - - memory.usage - memory_pd_server: - - pd_server - - memory - 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 - 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 - cpu_util_pd_server: - - pd_server - - cpu_util - disk.device.write.requests.rate_pd_server: - - pd_server - - disk.device.write.requests.rate - disk.read.bytes_pd_server: - - pd_server - - disk.read.bytes - 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 - disk.iops_pd_server: - - pd_server - - disk.iops - memory.resident_pd_server: - - pd_server - - memory.resident - 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 - disk.device.write.bytes.rate_pd_server: - - pd_server - - disk.device.write.bytes.rate - disk.device.write.requests_pd_server: - - pd_server - - disk.device.write.requests - endpoint_pd_server: - - pd_server - - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - disk.capacity_pd_server: - - pd_server - - disk.capacity - disk.device.allocation_pd_server: - - pd_server - - disk.device.allocation - disk.allocation_pd_server: - - pd_server - - disk.allocation - binding_pd_server: - - pd_server - - binding - disk.read.requests_pd_server: - - pd_server - - disk.read.requests - 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 - disk.device.read.requests.rate_pd_server: - - pd_server - - disk.device.read.requests.rate - disk.root.size_pd_server: - - pd_server - - disk.root.size - disk.device.read.bytes_pd_server: - - pd_server - - disk.device.read.bytes - disk.device.write.bytes_pd_server: - - pd_server - - disk.device.write.bytes - disk.device.read.requests_pd_server: - - pd_server - - disk.device.read.requests - instance_pd_server: - - pd_server - - instance - host_pd_server: - - pd_server - - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - disk.write.requests.rate_pd_server: - - pd_server - - disk.write.requests.rate - disk.ephemeral.size_pd_server: - - pd_server - - disk.ephemeral.size - disk.write.requests_pd_server: - - pd_server - - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature - disk.device.latency_pd_server: - - pd_server - - disk.device.latency - disk.latency_pd_server: - - pd_server - - disk.latency - 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 - requirements: - 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 - dependency_pd_server: - - pd_server - - dependency -- cgit 1.2.3-korg