From 51e051e86f9f5d10c9439e9e5e57d1e9ee8f8e06 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Thu, 22 Feb 2018 14:32:06 +0530 Subject: VLAN tagging - Pattern 1A, 1C1 1. Implementation for supporting VLAN tagging in Pattern 1A and 1C1 heats 2. Updated code for switch case refactor with command design pattern 3. Added unit tests and bug fixes Change-Id: I54938ffd6673f865b4506a890ec8e7b9c54597b1 Issue-ID: SDC-1036 Signed-off-by: ojasdubey --- .../out/MainServiceTemplate.yaml | 261 ++++++------ .../out/MainServiceTemplate.yaml | 309 +++++++------- .../out/MainServiceTemplate.yaml | 321 +++++++------- .../out/MainServiceTemplate.yaml | 249 +++++------ .../out/MainServiceTemplate.yaml | 348 +++++++-------- .../out/MainServiceTemplate.yaml | 426 +++++++++---------- .../out/MainServiceTemplate.yaml | 291 ++++++------- .../out/MainServiceTemplate.yaml | 299 ++++++------- .../out/MainServiceTemplate.yaml | 458 ++++++++++---------- .../out/MainServiceTemplate.yaml | 466 +++++++++++---------- 10 files changed, 1747 insertions(+), 1681 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml index 69830feadc..4ec6fb66a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml @@ -1,128 +1,133 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - node_templates: - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 - compute_pd_server_user_data_format: - - RAW_SERVER_PD_2 - - RAW_SERVER_PD_1 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - abstract_pd_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml index 00c6eeb558..601ea81752 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml @@ -1,152 +1,157 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - node_templates: - network_policy_server_pd_01: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - name: - get_attribute: - - abstract_pd_server - - pd_server_accessIPv4 - network_policy_server_pd_02: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - name: - get_attribute: - - abstract_pd_server - - pd_server_accessIPv6 - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 - compute_pd_server_user_data_format: - - RAW_SERVER_PD_2 - - RAW_SERVER_PD_1 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - network_policy_port0: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - entries: - get_attribute: - - abstract_pd_server - - pd_server_pd01_port_device_owner - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - network_policy_server_pd_01 - - network_policy_server_pd_02 - - network_policy_port0 - - abstract_pd_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + network_policy_server_pd_01: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + network_policy_server_pd_02: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv6 + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + network_policy_port0: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + entries: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_device_owner + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - network_policy_server_pd_01 + - network_policy_server_pd_02 + - network_policy_port0 + - abstract_pd_server \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index ec6a628f96..e1c71de8c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -1,158 +1,163 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - dummy_net_name_1: - label: dummy net name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: dummy_net_name_1 - type: string - description: dummy net name - default: Network-1 - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - node_templates: - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - get_attribute: - - network_policy_server - - name - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 - compute_pd_server_user_data_format: - - RAW_SERVER_PD_2 - - get_attribute: - - network_policy_server - - name - compute_pd_server_metadata: - - get_attribute: - - network_policy_server - - name - - null - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - 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 - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - network_policy_server - - abstract_pd_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + dummy_net_name_1: + label: dummy net name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 + type: string + description: dummy net name + default: Network-1 + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - get_attribute: + - network_policy_server + - name + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - get_attribute: + - network_policy_server + - name + compute_pd_server_metadata: + - get_attribute: + - network_policy_server + - name + - null + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + 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 + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - network_policy_server + - abstract_pd_server \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml index 806765b626..1d875f2085 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml @@ -1,122 +1,127 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - node_templates: - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - abstract_pd_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml index dd5df2e5cb..c22da7165d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml @@ -1,171 +1,177 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - packet_mirror_network_name: - label: packet mirror network name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: packet_mirror_network_name - type: string - description: name of the oam network - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - node_templates: - jsa_security_group: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules - properties: - name: Test-SecurityGroup - description: ems security group - rules: - - protocol: icmp - ethertype: IPv6 - remote_ip_prefix: ::/0 - direction: ingress - requirements: - - port: - capability: attachment_pd_server_pd01_port - node: abstract_pd_server - relationship: org.openecomp.relationships.AttachesTo - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_security_groups: - - - jsa_security_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 - compute_pd_server_user_data_format: - - RAW_SERVER_PD_2 - - RAW_SERVER_PD_1 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - resource_with_dependOn: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: packet_mirror_network_name - requirements: - - dependency: - capability: feature_pd_server - node: abstract_pd_server - relationship: tosca.relationships.DependsOn - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - jsa_security_group - - resource_with_dependOn - - abstract_pd_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + packet_mirror_network_name: + label: packet mirror network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name + type: string + description: name of the oam network + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + jsa_security_group: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: Test-SecurityGroup + description: ems security group + rules: + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + requirements: + - port: + capability: attachment_pd_server_pd01_port + node: abstract_pd_server + relationship: org.openecomp.relationships.AttachesTo + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_security_groups: + - - jsa_security_group + - - jsa_security_group + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + resource_with_dependOn: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_mirror_network_name + requirements: + - dependency: + capability: feature_pd_server + node: abstract_pd_server + relationship: tosca.relationships.DependsOn + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - jsa_security_group + - resource_with_dependOn + - abstract_pd_server \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml index d8ed63f516..acdd8c1db4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml @@ -1,210 +1,216 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd01_cinder_volume_size: - label: volume size - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd01_cinder_volume_size - type: string - description: volume size - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - packet_mirror_network_name: - label: packet mirror network name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: packet_mirror_network_name - type: string - description: name of the network - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - pd01_volume_type: - label: volume type - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd01_volume_type - type: string - description: volume type - node_templates: - packet_mirror_network: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: packet_mirror_network_name - pd01_volume: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: pd01_volume_type - size: '(get_input : pd01_cinder_volume_size) * 1024' - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - packet_mirror_network - compute_pd_server_user_data_format: - - RAW_SERVER_PD_2 - - RAW_SERVER_PD_1 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - requirements: - - dependency_pd_server: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - link_pd_server_pd01_port: - capability: tosca.capabilities.network.Linkable - node: packet_mirror_network - relationship: tosca.relationships.network.LinksTo - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: pd01_volume - relationship: pd02_volume_attachment - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: pd01_volume - relationship: pd01_volume_attachment - relationship_templates: - pd01_volume_attachment: - type: org.openecomp.relationships.VolumeAttachesTo - properties: - volume_id: pd01_volume - instance_uuid: abstract_pd_server - pd02_volume_attachment: - type: org.openecomp.relationships.VolumeAttachesTo - properties: - volume_id: pd01_volume - instance_uuid: abstract_pd_server - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - packet_mirror_network - - pd01_volume - - abstract_pd_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd01_cinder_volume_size: + label: volume size + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_cinder_volume_size + type: string + description: volume size + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + packet_mirror_network_name: + label: packet mirror network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name + type: string + description: name of the network + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + pd01_volume_type: + label: volume type + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_volume_type + type: string + description: volume type + node_templates: + packet_mirror_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_mirror_network_name + pd01_volume: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: pd01_volume_type + size: '(get_input : pd01_cinder_volume_size) * 1024' + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - packet_mirror_network + - packet_mirror_network + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - dependency_pd_server: + capability: tosca.capabilities.Node + node: packet_mirror_network + relationship: tosca.relationships.DependsOn + - link_pd_server_pd01_port: + capability: tosca.capabilities.network.Linkable + node: packet_mirror_network + relationship: tosca.relationships.network.LinksTo + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: pd01_volume + relationship: pd02_volume_attachment + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: pd01_volume + relationship: pd01_volume_attachment + relationship_templates: + pd01_volume_attachment: + type: org.openecomp.relationships.VolumeAttachesTo + properties: + volume_id: pd01_volume + instance_uuid: abstract_pd_server + pd02_volume_attachment: + type: org.openecomp.relationships.VolumeAttachesTo + properties: + volume_id: pd01_volume + instance_uuid: abstract_pd_server + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - packet_mirror_network + - pd01_volume + - abstract_pd_server \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml index 4c33369168..0ce529db5f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml @@ -1,143 +1,148 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - node_templates: - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_scheduler_hints: - - group: BE_Affinity_group - - group: BE_Affinity_group - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 - compute_pd_server_user_data_format: - - RAW_SERVER_PD_2 - - RAW_SERVER_PD_1 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - abstract_pd_server - BE_Affinity_group: - type: tosca.groups.Root - members: - - abstract_pd_server - policies: - BE_Affinity_policy: - type: org.openecomp.policies.placement.Colocate - properties: - name: Policy_BE_Affinity - affinity: host - targets: - - BE_Affinity_group +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + BE_Affinity_group: + type: tosca.groups.Root + members: + - abstract_pd_server + policies: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: Policy_BE_Affinity + affinity: host + targets: + - BE_Affinity_group \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml index 1ec1a4b153..af572a753e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -1,147 +1,152 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - node_templates: - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 - compute_pd_server_user_data_format: - - RAW_SERVER_PD_2 - - RAW_SERVER_PD_1 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - abstract_pd_server - outputs: - output_attr_port_pd_0: - description: output attr port0 - value: - get_attribute: - - abstract_pd_server - - pd_server_pd01_port_device_id - output_attr_server_pd_1: - description: output attr pd1 - value: - get_attribute: - - abstract_pd_server - - pd_server_accessIPv4 - output_attr_server_pd_2: - description: output attr pd2 - value: - get_attribute: - - abstract_pd_server - - pd_server_accessIPv6 +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + outputs: + output_attr_port_pd_0: + description: output attr port0 + value: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_device_id + output_attr_server_pd_1: + description: output attr pd1 + value: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + output_attr_server_pd_2: + description: output attr pd2 + value: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv6 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index dff6ff6335..f26e26a3d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -1,223 +1,235 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - ps_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: ps_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPS001 - - ZRDM1MOGX01MPS002 - - ZRDM1MOGX01MPS003 - - ZRDM1MOGX01MPS004 - entry_schema: - type: string - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - ps_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: ps_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - ps_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: ps_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - node_templates: - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-PD-1 - - Network-PD-0 - compute_pd_server_user_data_format: - - null - - RAW - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - abstract_ps_server: - type: org.openecomp.resource.abstract.nodes.ps_server - directives: - - substitutable - properties: - compute_ps_server_name: - - get_input: - - ps_server_names - - 0 - - get_input: - - ps_server_names - - 1 - compute_ps_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_ps_server_user_data_format: - - null - - RAW - vm_flavor_name: - get_input: ps_flavor_name - vm_image_name: - get_input: ps_image_name - port_ps01_port_replacement_policy: - - AUTO - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: - - Network-PS-0 - - Network-PS-1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - service_template_filter: - substitute_service_template: Nested_ps_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - abstract_pd_server - - abstract_ps_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + ps_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPS001 + - ZRDM1MOGX01MPS002 + - ZRDM1MOGX01MPS003 + - ZRDM1MOGX01MPS004 + entry_schema: + type: string + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + ps_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + ps_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO + - AUTO + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-PD-1 + - Network-PD-0 + compute_pd_server_user_data_format: + - null + - RAW + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_ps_server: + type: org.openecomp.resource.abstract.nodes.ps_server + directives: + - substitutable + properties: + compute_ps_server_name: + - get_input: + - ps_server_names + - 0 + - get_input: + - ps_server_names + - 1 + compute_ps_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_ps_server_user_data_format: + - null + - RAW + vm_flavor_name: + get_input: ps_flavor_name + vm_image_name: + get_input: ps_image_name + port_ps01_port_replacement_policy: + - AUTO + - AUTO + port_ps01_port_mac_requirements: + mac_count_required: + is_required: false + port_ps01_port_network: + - Network-PS-0 + - Network-PS-1 + port_ps01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_ps_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + - abstract_ps_server \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index d8244c25d5..3e3f5cf6f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -1,227 +1,239 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - pd_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - ps_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: ps_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPS001 - - ZRDM1MOGX01MPS002 - - ZRDM1MOGX01MPS003 - - ZRDM1MOGX01MPS004 - entry_schema: - type: string - availabilityzone_name: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: availabilityzone_name - type: string - description: availabilityzone name - default: nova - ps_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: ps_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_image_name: - label: image name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_image_name - type: string - description: PD image name - default: MOG_BASE_8.0 - pd_server_names: - label: PD server names - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: pd_server_names - type: list - description: name of the PD instance - default: - - ZRDM1MOGX01MPD001 - - ZRDM1MOGX01MPD002 - entry_schema: - type: string - ps_flavor_name: - label: PD flavor name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - hot-mog-0108-bs1271 - source_type: HEAT - param_name: ps_flavor_name - type: string - description: flavor name of PD instance - default: m3.xlarge - node_templates: - abstract_pd_server: - type: org.openecomp.resource.abstract.nodes.pd_server - directives: - - substitutable - properties: - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - Network-PD-1 - - Network-PD-0 - compute_pd_server_user_data_format: - - null - - get_attribute: - - abstract_ps_server - - ps_server_accessIPv4 - service_template_filter: - substitute_service_template: Nested_pd_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - abstract_ps_server: - type: org.openecomp.resource.abstract.nodes.ps_server - directives: - - substitutable - properties: - compute_ps_server_name: - - get_input: - - ps_server_names - - 0 - - get_input: - - ps_server_names - - 1 - compute_ps_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_ps_server_user_data_format: - - get_attribute: - - abstract_pd_server - - pd_server_accessIPv4 - - null - vm_flavor_name: - get_input: ps_flavor_name - vm_image_name: - get_input: ps_image_name - port_ps01_port_replacement_policy: - - AUTO - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: - - Network-PS-0 - - Network-PS-1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - service_template_filter: - substitute_service_template: Nested_ps_serverServiceTemplate.yaml - count: 2 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - groups: - hot-mog-0108-bs1271_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/hot-mog-0108-bs1271.yml - description: heat template that creates MOG stack - members: - - abstract_pd_server - - abstract_ps_server +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + ps_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPS001 + - ZRDM1MOGX01MPS002 + - ZRDM1MOGX01MPS003 + - ZRDM1MOGX01MPS004 + entry_schema: + type: string + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + ps_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + ps_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO + - AUTO + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-PD-1 + - Network-PD-0 + compute_pd_server_user_data_format: + - null + - get_attribute: + - abstract_ps_server + - ps_server_accessIPv4 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_ps_server: + type: org.openecomp.resource.abstract.nodes.ps_server + directives: + - substitutable + properties: + compute_ps_server_name: + - get_input: + - ps_server_names + - 0 + - get_input: + - ps_server_names + - 1 + compute_ps_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_ps_server_user_data_format: + - get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + - null + vm_flavor_name: + get_input: ps_flavor_name + vm_image_name: + get_input: ps_image_name + port_ps01_port_replacement_policy: + - AUTO + - AUTO + port_ps01_port_mac_requirements: + mac_count_required: + is_required: false + port_ps01_port_network: + - Network-PS-0 + - Network-PS-1 + port_ps01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_ps_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + - abstract_ps_server \ No newline at end of file -- cgit 1.2.3-korg