diff options
author | 2018-02-22 14:32:06 +0530 | |
---|---|---|
committer | 2018-02-28 09:56:30 +0000 | |
commit | 51e051e86f9f5d10c9439e9e5e57d1e9ee8f8e06 (patch) | |
tree | 957583dc6b93667d7024c7258716d6c6b96776c2 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles | |
parent | bc169d4b132891052cc8c642e18e642afd04464f (diff) |
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 <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles')
3 files changed, 433 insertions, 444 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index fe2be599b5..cd3f9701c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,7 +5,7 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.heat.nested: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: vlan_ids: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml index a9d7c6b6ec..b99f0a0a76 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml @@ -1,442 +1,431 @@ -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 -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server -topology_template: - inputs: - cmaui_names: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_names - type: list - description: CMAUI1, CMAUI2 server names - entry_schema: - type: string - template_PortTuple_LB1: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: template_PortTuple_LB1 - type: string - oam_sec_group_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: oam_sec_group_name - type: string - lb_st_interface_type_oam: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: lb_st_interface_type_oam - type: string - virtual_ip_address: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: virtual_ip_address - type: string - security_group_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: security_group_name - type: list - description: CMAUI1, CMAUI2 server names - entry_schema: - type: string - jsa_net_name: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: jsa_net_name - type: string - description: network name of jsa log network - vlan_ids: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: vlan_ids - type: string - cmaui_image: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_image - type: string - description: Image for CMAUI server - virtual_ipv6_address: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: virtual_ipv6_address - type: string - cmaui_flavor: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_flavor - type: string - description: Flavor for CMAUI server - lb_st_vlan_type_oam: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: lb_st_vlan_type_oam - type: string - description: dummy - mac_address: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: mac_address - type: string - availability_zone_0: - label: availabilityzone name - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: availability_zone_0 - type: string - description: availabilityzone name - cmaui_oam_ips: - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - main - source_type: HEAT - param_name: cmaui_oam_ips - type: string - node_templates: - cmaui_port_2: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - mac_requirements: - mac_count_required: - is_required: false - network: test_net1 - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui_nova - relationship: tosca.relationships.network.BindsTo - test_nested_invalidConnection: - type: org.openecomp.resource.abstract.nodes.heat.nested - directives: - - substitutable - properties: - p1: test_Vlan1 - service_template_filter: - substitute_service_template: nestedServiceTemplate.yaml - p2: server_cmaui_nova - test_net2: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - template_VMInt_OAM_lb_1: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - test_net1 - virtual_machine_interface_properties: - service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui_nova - relationship: tosca.relationships.network.BindsTo - test_resourceGroup: - type: org.openecomp.resource.abstract.nodes.heat.nested - directives: - - substitutable - properties: - p1: template_VMInt_OAM_lb_1 - service_template_filter: - substitute_service_template: nestedServiceTemplate.yaml - count: 9 - mandatory: true - p2: cmaui_port_2 - net2: test_net2 - net1: test_net1 - requirements: - - link_template_Vlan_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding_template_Vlan_2: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_2 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_1: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - test_net1: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - test_Vlan2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: vlan - virtual_network_refs: - - test_net1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - test_Vlan1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - test_Vlan2 - name: vlan - virtual_network_refs: - - test_net1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - server_cmaui_nova: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - test_nested: - type: org.openecomp.resource.abstract.nodes.heat.nested - directives: - - substitutable - properties: - p1: template_VMInt_OAM_lb_1 - service_template_filter: - substitute_service_template: nestedServiceTemplate.yaml - p2: cmaui_port_2 - net2: test_net2 - net1: test_net1 - requirements: - - link_template_Vlan_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - binding_template_Vlan_2: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_2 - relationship: tosca.relationships.network.BindsTo - - binding_template_Vlan_1: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo - groups: - main_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/main.yml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - cmaui_port_2 - - test_nested_invalidConnection - - test_net2 - - template_VMInt_OAM_lb_1 - - test_resourceGroup - - test_net1 - - test_Vlan2 - - test_Vlan1 - - server_cmaui_nova - - test_nested +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
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.cmaui:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ cmaui_names:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ template_PortTuple_LB1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
+ type: string
+ oam_sec_group_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_sec_group_name
+ type: string
+ lb_st_interface_type_oam:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
+ type: string
+ virtual_ip_address:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: virtual_ip_address
+ type: string
+ security_group_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: security_group_name
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ jsa_net_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: jsa_net_name
+ type: string
+ description: network name of jsa log network
+ vlan_ids:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vlan_ids
+ type: string
+ cmaui_image:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
+ type: string
+ description: Image for CMAUI server
+ virtual_ipv6_address:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: virtual_ipv6_address
+ type: string
+ cmaui_flavor:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
+ type: string
+ description: Flavor for CMAUI server
+ lb_st_vlan_type_oam:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: lb_st_vlan_type_oam
+ type: string
+ description: dummy
+ mac_address:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: mac_address
+ type: string
+ availability_zone_0:
+ label: availabilityzone name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: availability_zone_0
+ type: string
+ description: availabilityzone name
+ cmaui_oam_ips:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_oam_ips
+ type: string
+ node_templates:
+ cmaui_port_2:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ replacement_policy: AUTO
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input:
+ - cmaui_oam_ips
+ - 0
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network: test_net1
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_cmaui_nova
+ relationship: tosca.relationships.network.BindsTo
+ test_nested_invalidConnection:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ directives:
+ - substitutable
+ properties:
+ p1: test_Vlan1
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ p2: server_cmaui_nova
+ requirements:
+ - binding_template_Vlan_1:
+ capability: tosca.capabilities.network.Bindable
+ node: test_Vlan1
+ relationship: tosca.relationships.network.BindsTo
+ test_net2:
+ type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+ properties:
+ shared: true
+ network_name:
+ get_input: jsa_net_name
+ template_VMInt_OAM_lb_1:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ security_group_refs:
+ - get_input: oam_sec_group_name
+ virtual_network_refs:
+ - test_net1
+ virtual_machine_interface_properties:
+ service_interface_type:
+ get_input: lb_st_interface_type_oam
+ port_tuple_refs:
+ - get_input: template_PortTuple_LB1
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_cmaui_nova
+ relationship: tosca.relationships.network.BindsTo
+ test_resourceGroup:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ directives:
+ - substitutable
+ properties:
+ p1: template_VMInt_OAM_lb_1
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ count: 9
+ mandatory: true
+ p2: cmaui_port_2
+ net2: test_net2
+ net1: test_net1
+ requirements:
+ - link_template_Vlan_2:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net2
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_1:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding_template_Vlan_2:
+ capability: tosca.capabilities.network.Bindable
+ node: cmaui_port_2
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_1:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ test_net1:
+ type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+ properties:
+ shared: true
+ network_name:
+ get_input: jsa_net_name
+ test_Vlan2:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ name: vlan
+ virtual_network_refs:
+ - test_net1
+ virtual_machine_interface_allowed_address_pairs:
+ allowed_address_pair:
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ip_address
+ ip_prefix_len: 32
+ mac:
+ get_input: mac_address
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ipv6_address
+ ip_prefix_len: 128
+ mac:
+ get_input: mac_address
+ virtual_machine_interface_mac_addresses:
+ - get_input: mac_address
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ test_Vlan1:
+ type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+ properties:
+ name: vlan
+ virtual_network_refs:
+ - test_net1
+ virtual_machine_interface_allowed_address_pairs:
+ allowed_address_pair:
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ip_address
+ ip_prefix_len: 32
+ mac:
+ get_input: mac_address
+ - address_mode: active-standby
+ ip:
+ ip_prefix:
+ get_input: virtual_ipv6_address
+ ip_prefix_len: 128
+ mac:
+ get_input: mac_address
+ virtual_machine_interface_mac_addresses:
+ - get_input: mac_address
+ requirements:
+ - link:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ server_cmaui_nova:
+ type: org.openecomp.resource.vfc.nodes.heat.cmaui
+ properties:
+ flavor:
+ get_input: cmaui_flavor
+ availability_zone:
+ get_input: availability_zone_0
+ image:
+ get_input: cmaui_image
+ contrail_service_instance_ind: true
+ name:
+ get_input:
+ - cmaui_names
+ - 0
+ test_nested:
+ type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
+ directives:
+ - substitutable
+ properties:
+ p1: template_VMInt_OAM_lb_1
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ p2: cmaui_port_2
+ net2: test_net2
+ net1: test_net1
+ requirements:
+ - link_template_Vlan_2:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net2
+ relationship: tosca.relationships.network.LinksTo
+ - link_template_Vlan_1:
+ capability: tosca.capabilities.network.Linkable
+ node: test_net1
+ relationship: tosca.relationships.network.LinksTo
+ - binding_template_Vlan_2:
+ capability: tosca.capabilities.network.Bindable
+ node: cmaui_port_2
+ relationship: tosca.relationships.network.BindsTo
+ - binding_template_Vlan_1:
+ capability: tosca.capabilities.network.Bindable
+ node: template_VMInt_OAM_lb_1
+ relationship: tosca.relationships.network.BindsTo
+ groups:
+ main_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/main.yml
+ description: |
+ Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+ members:
+ - cmaui_port_2
+ - test_nested_invalidConnection
+ - test_net2
+ - template_VMInt_OAM_lb_1
+ - test_resourceGroup
+ - test_net1
+ - test_Vlan2
+ - test_Vlan1
+ - server_cmaui_nova
+ - test_nested
\ 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/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index d1c8a517a9..949d55d270 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -188,7 +188,7 @@ topology_template: - template_Vlan_2 - template_Vlan_1 substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested capabilities: feature_template_Vlan_2: - template_Vlan_2 |