diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
---|---|---|
committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn | |
parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) |
Added new nodes type
Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.
Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn')
3 files changed, 214 insertions, 195 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 413b91c5ce..a397543a9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -309,6 +315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED 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 0a497cb72a..7ac39945a6 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,187 +1,190 @@ -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: 6
- 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
- - ip_version: 6
- 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: 6 + 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 + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index ba596578fc..b1ffb37314 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -105,26 +110,30 @@ topology_template: pd_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + replacement_policy: + get_input: + - port_pd01_port_replacement_policy + - index_value + mac_requirements: + get_input: port_pd01_port_mac_requirements + order: + get_input: port_pd01_port_order security_groups: get_input: - port_pd01_port_security_groups - index_value exCP_naming: get_input: port_pd01_port_exCP_naming - replacement_policy: - get_input: - - port_pd01_port_replacement_policy - - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value 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: |